Merge "53031 and 53032: XML formatting line separator fix"