Imported changes from new upstream release v2.3.0
Bumped version number to v2.3.1