Merge "Do not force expected-xml"