Merge branch 'release/1.0.4' into develop
Fix wrong type
Merge branch 'develop'