Imported changes from new upstream release v2.3.0