Merge branch 'release/0.5.4'