Merge branch 'ps/bundle-verify-arg'