Merge branch 'release-4-5-patches' into orderparm