Still needs some other updates for 2.5 but this squashes the security stuff as per 2.4
Attach a file by drag & drop or click to upload
