Merge branch 'release-4.5'