please look at the query PR. i have updated it in response to comments. https://github.com/pantsbuild/pants/pull/7350

@average-vr-56795: do you have time to re-review, and/or see whether your blocking review still stands?

Commented - my big concern has been addressed, but I realistically don’t have time to give proper review in the near future 🙂