Close #6501 and #6469 This is not exactly a backport from trunk, since this is less aggressive.
Attach a file by drag & drop or click to upload
