Created attachment 10334 [details] proposed patch for 4.2, cherry-picked from master
Pushed to autobuild-v4-2-test.
Pushed to v4-2-test. Closing out bug report. Thanks!