Fixes #1532, but there's potentially room for optimization. Committing the simple version for CI tests.
Attach a file by drag & drop or click to upload
