Merge branch 'ps/bundle-verify-arg' into maint