Hotfix 1.0.4-1
Merge branch 'hotfix/1.0.4-1'