Merge branch 'hotfix/v1.0.4' into develop
Merge branch 'master' into develop