Merge branch 'hotfix/1.0.3-1'
Merge branch 'release/1.0.4'
Hotfix 1.0.4-1
Merge branch 'hotfix/1.0.4-1' into develop