BUG #5831 Post-review changes, merging improvements from Monty.
Attach a file by drag & drop or click to upload