There was one place where we missed an unlock, in addition some more code cleanups.
Attach a file by drag & drop or click to upload
