Merge branch 'release/0.2.12'
Merge branch 'master' into develop