Merge branch 'hotfix/new_hf_from_master' into develop
dqd
Merge branch 'develop'