@early-needle-54791 or @average-vr-56795 it'd be great if you could give one last look at https://github.com/pantsbuild/pants/pull/9198 , I'm itching to finally hit merge on this chunk of work 🙂