@limited-country-20626 : tell you what. if you have time to implement the fix for https://github.com/pantsbuild/pants/issues/4051 in master, i'll backport it. should be pretty straightforward.