It would be good to backport c6999a248ad78f75cbfcc0f461298021b20905b4 to 4.8.
Created attachment 13984 [details] Patch for 4.8 cherry-picked from master
Pushed to autobuild-v4-8-test.
Pushed to v4-8-test. Closing out bug report. Thanks!