Created attachment 8802 [details] Patch from master
Karolin, please pick for v4-next
Pushed to autobuild-v4-0-test.
Pushed to v4-0-test. Closing out bug report. Thanks!