Automated cherry pick of #71895 #72106 upstream release 1.13
Attach a file by drag & drop or click to upload
