v0.6.3 release
Merge branch 'develop' for v0.6.3 release