It would be good to do a backport of 0edce86e97a49f4bd79f4431015ac2b788105e46 for 4.8.
Created attachment 13982 [details] Patch for 4.8 cherry-picked from master
Karolin, please add the patch to the next rc. Thanks!
Pushed to autobuild-v4-8-test.
Pushed to v4-8-test. Closing out bug report. Thanks!