quick change to copy
Merge branch 'hotfix/1.0.4' into develop