Merge "Update current.txt to fix inconsistencies"