Partial cherry pick from #9601 in order for the tests in #9601 to pass (cherry picked from commit b91d8b28)
Attach a file by drag & drop or click to upload