Merge branch 'release-v0.5.4'
Merge branch 'master' into develop