Merge branch 'release/0.5.2'
Merge branch 'develop'
Merge branch 'develop'