Merge "Fix to allow tracking of new files"