Commits/changes from 2.3.0-release-candidates RC5