Merge branch 'hotfix/47' into develop
Merge branch 'develop'