Release 1.12

Merge release-1.12 into develop