Version bump
Merge branch 'release/2.12.0' into develop