merged #5998 thanks to @witty-crayon-22786 and rebased the

1.9.0rc0

update PR at https://github.com/pantsbuild/pants/pull/6171