lbernail: Automated cherry pick of #77802 upstream release 1.13

No Results