Merge "Fix for badly rebased current.xml"