Version bump
Merge branch 'release/2.0-RC1.2' into develop