Can I get a review on this cherry-pick from

main

to the

2.8.x

release branch? (ping @witty-crayon-22786) https://github.com/pantsbuild/pants/pull/13394

I can review

thanks! Should be non-controversial 🙂