Version bump
Merge branch 'release/0.5.2'
Merge branch 'master' into dev
Dev mode enabled