Created attachment 12376 [details] Patches for v4-5 branch
Hi Karolin, This is ready for 4.5. Thanks...
Pushed to autobuild-v4-5-test.
Pushed to v4-5-test.