Merge branch 'hotfix/48' into develop
Merge branch 'develop'