@aloof-angle-91616: so i know that the cherry-pick of https://github.com/pantsbuild/pants/pull/5521 requires a bit of munging. i can do the cherry-pick itself if you haven't started editing the

1.9.x

branch