Bump version
Merge branch 'release/2.0-RC1.3' into develop