version bump
Merge branch 'release/4.12' into develop