chore: Cherry-picked changes from upstream#27

github-actions[bot] wants to merge 1 commit into

mainstep-security/unity-builder:mainfrom

auto-cherry-pickstep-security/unity-builder:auto-cherry-pickCopy head branch name to clipboard