Final changes for v2.3.
Merge branch 'v2.3.0-prep'