Serialize GenericFile.size as int
Merge branch 'develop' into feature/identifiers