Closes #1841
Fixes bug in 3.1 update because of the new event handler registration
hotfix from master
Merge branch 'develop-importantissues' into develop
Updated Version 3.0.14.042