Cherry-pick xml fix in Mono.