both https://github.com/pantsbuild/pants/pull/4986 and https://github.com/pantsbuild/pants/pull/4969 look approximately ready to go, but everyone please hold off on merging them until we get https://github.com/pantsbuild/pants/pull/4992 in.