chore: Cherry-picked changes from upstream#27

github-actions[bot] wants to merge 3 commits intomainstep-security/create-pull-request:mainfrom

auto-cherry-pickstep-security/create-pull-request:auto-cherry-pickCopy head branch name to clipboard