Registration on events fixes
Merge origin/develop into develop