hey folks, https://github.com/pantsbuild/pants/pull/20241 should be ready to go. I marked it for cherry-pick back to 2.18. Could someone please merge it?

I've merged it.