Merge branch 'hotfix/bugFixes'
Fixed issues with registration.
Merge branch 'hotfix/dynamicBinBugFixes' into develop