Merge "Updated current.xml as autogenerated"