tallclair: Automated cherry pick of #72761 upstream release 1.12

No Results