Merge branch 'hotfix/1.0.4-1'
Merge branch 'release/1.0.5'
fix
Merge branch 'hotfix/1.0.5-1' into develop