remove whitespace
Merge branch 'release-2.3.0' into wip