Also add a few extra asserts, in an effort to chase down #2591
Attach a file by drag & drop or click to upload
