hot fix
Merge commit '986bda5cdf9065df5967b5be8f68d2bd09f2ad4e' into Dev
Register Fix