Device registration freezes

Other WeBack issues: