chore: Cherry-picked changes from upstream#127

github-actions[bot] wants to merge 2 commits intomainstep-security/get-cmake:mainfrom

auto-cherry-pickstep-security/get-cmake:auto-cherry-pickCopy head branch name to clipboard