Merge "Remove filegroups for *current.txt files"