Add cherry-picked commit to 1.23.0 (#8804)
Add cherry-picked commit to 1.23.0 (#8804)


tdyas/pants,wisechengyi/pants,tdyas/pants,pantsbuild/pants,wisechengyi/pants,benjyw/pants,benjyw/pants,benjyw/pants,jsirois/pants,wisechengyi/pants,tdyas/pants,pantsbuild/pants,wisechengyi/pants,tdyas/pants,benjyw/pants,benjyw/pants,tdyas/pants,tdyas/pants,benjyw/pants,jsirois/pants,wisechengyi/pants,wisechengyi/pants,pantsbuild/pants,tdyas/pants,tdyas/pants,wisechengyi/pants,pantsbuild/pants,wisechengyi/pants,pantsbuild/pants,pantsbuild/pants,pantsbuild/pants,tdyas/pants,benjyw/pants,wisechengyi/pants,jsirois/pants