Backport candidate. All but one or two of these changes are applicable to 2.2.2.
Attach a file by drag & drop or click to upload
