Hotfixes
Merge branch 'master' into development
Merge branch 'development'