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