Merge branch 'release-preparation' into 4.5.x