Merge "Improve XML CData formatting"