Merge branch 'develop/0.5.x'