@billowy-beach-68498 : know it's a bit late, but if you have time to look at https://github.com/pantsbuild/pants/pull/4578 , would be appreciated.