refactoring KFSDataObject
Merge branch 'master' into KFSDataObject