Merge branch 'hotfix/1.0.4'
Merge branch 'master' into develop