Merge "Fix alphanumeric order in current.txt"