Merge branch 'release/0.12' into develop
and that will be a day
Merge branch 'develop'