Merge branch 'hotfix/hf1' into develop
Merge branch 'develop'