PLFM-1648: save entity + file handle + annotations with Submission