IncludeInFetch support when new file was merged
Refactor.
Merge #584