wojtek-t: Manual cherry pick of #80978 upstream release 1.14

No Results