Hello this is low priority, but can anyone take a look into https://github.com/pantsbuild/pants/pull/5978?

would recommend rebasing and fixing the merge conflicts so the diff is easier to follow