some fixes
Merge branch 'hotfixes' into develop
Merge branch 'develop' into testing