Patch contributed by Vajrasky Kok. Addresses Issue #17324
Attach a file by drag & drop or click to upload
