Cleaning up CDataFile to get ready for writing.
Merge remote-tracking branch 'veris/master'
Cleaning up CDataFile to get ready for writing.