Merge branch 'release/0.5.4' into develop
Rearrange params
Merge branch 'develop'