@wide-energy-11069: i'd love to get in https://github.com/pantsbuild/pants/pull/6790 ... but i should be able to cherry-pick it if need be. i have at least one more CI run, so probably best not to wait.