I've got https://github.com/pantsbuild/pants/pull/18415 and there will be one more, which is pretty much ready and just waiting on this one