waiting for CI on https://github.com/pantsbuild/pants/pull/5809, then I’ll merge and cut the 1.7.x branch