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