Merge branch 'hotfix/hf' into develop
Merge branch 'develop'