Implemented RemoveFile() in all scopes.
Merge remote-tracking branch 'remotes/origin/topic-data-incrementalupdate' into topic-data-incrementalupdate