Hey folks, got a PR that should be ready for review if anyone has time: https://github.com/pantsbuild/pants/pull/20411