SOS-1914 Abstract out to a util class
SOS-1914 SF
SOS-1914 Comments go on the file entry and not specific versions in CE