Created attachment 10414 [details] patch
Pushed to master
Created attachment 10437 [details] Patch for v4-2-test
Pushed to autobuild-v4-2-test.
(In reply to Karolin Seeger from comment #3) Pushed to v4-2-test. Closing out bug report. Thanks!