Attempting to manually cherry-pick this commit: 30c14c2f
Attach a file by drag & drop or click to upload
