Apply hotfix
Merge branch 'develop'