@witty-crayon-22786 If you fancy rebasing https://github.com/pantsbuild/pants/pull/6636 when your fix lands, updating the release notes, and merging it, I’m sure @red-balloon-89377 would appreciate it 🙂