Merge "Update current.xml to fix the build"