Merge "Handle new current.txt format."