Merge "Add genrules for merged current.txt"