Also improve overall quality. (cherry picked from commit 7232c1e3409b65790d98d44467e4ef3739940478)
Attach a file by drag & drop or click to upload
