Merge branch 'release/0.4.4' into develop
Fix wrong definition's name
Merge branch 'develop'