merged in v1.65-junit-xml