Merge branch 'release/0.5.0' into develop