Rest of patch that should not be cherry picked into 3.5.2 final.
Attach a file by drag & drop or click to upload
