Download original file fs

Cherry-picked commit from 717 and support for fs.
Since we do not have yet a server with pre-fs data, you will only be able to test the additional commit i.e.
Import an image using fs and download it.