@witty-crayon-22786 Do you have time to cherry-pick https://github.com/pantsbuild/pants/pull/18917 to 2.16.x and 2.15.x?

Can do in a few hours

I've done https://github.com/pantsbuild/pants/pull/18944 to 2.16.x, it doesn't pick cleanly to 2.15.x and may not be worth the complexity of backporting there

sorry i didn’t do that earlier.