Update version number as 2.3.x
Merge branch 'release/2.3.0' into develop