Merge remote branch 'origin/release-4-5-patches'