2) we seem to be running into https://github.com/pantsbuild/pants/issues/6861 a bit lately too. Are there any updates on how to deal with that? We've just been rerunning the thing.