Merge "Fix current.xml for previous changes"