While fixing failing tests, did some code refactoring.
Attach a file by drag & drop or click to upload
