could some please merge https://github.com/pantsbuild/scie-pants/pull/414 so that we could close https://github.com/pantsbuild/pants/issues/20970 - it's the last one waiting to be merged. Thanks!