** Performance improvement ** - based on thorst #268 contribution.
Attach a file by drag & drop or click to upload