Merge branch 'hotfix/fire' into develop
Merge branch 'develop'