Fixed DataFileStub due to merging of branches