Fixes ticket #6153. Tested-by: Tyson Smith (cherry picked from commit 1d54be21)
Attach a file by drag & drop or click to upload
