Created attachment 8031 [details] Patches for v4-0-test backport autobuild fixes
Pushed to autobuild-v4-0-test. Closing out bug report. Thanks!