0.12.0
Merge branch 'release-0.12.0' into develop