Created attachment 15240 [details] patch for 4.9 and 4.10 cherry-picked from master
Assigning to Karolin, please include in the next releases. Thanks!
(In reply to Andrew Bartlett from comment #2) Pushed to autobuild-v4-{10,9}-test.
(In reply to Karolin Seeger from comment #3) Pushed to both branches. Closing out bug report. Thanks!