[UPDATE] Bump to 2.3.0
Merge branch 'release/2.3.0' into develop