fix registration
Merge branch 'register-fix' into development