Merge "current.xml" into honeycomb