Merge "Fix update_current.py"