wojtek-t: Automated cherry pick of #70735 #73845 upstream release 1.11

No Results