It would be good to backport 7c1c8c68174ed484fe86a0d9e429daad3a47a57d to 4.8.
Created attachment 13983 [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!