Hey guys, could you please check these 2 prs (they are related) when you have time? Thanks https://github.com/pantsbuild/pants/pull/20336 https://github.com/pantsbuild/pants/pull/20338