...
Created attachment 13642 [details] Patches for v4-7-test
Reassigning to Karolin for inclusion in 4.7.
Pushed to autobuild-v4-7-test
Pushed to v4-7-test. Closing out bug report. Thanks!