[IMP][TASK 9337] Make xml files pretty
Amend