.
Created attachment 14169 [details] Patch for v4-8-test
Created attachment 14170 [details] Patch for v4-7-test
Pushed to autobuild-v4-8-test
(In reply to Stefan Metzmacher from comment #3) ... and autobuild-v4-7-test obviously.
Pushed to to both branches. Closing out bug report. Thanks!