@average-vr-56795: looks great! https://github.com/pantsbuild/pants/pull/5104 will need a rebase... happy to do that if you're busy.