Merge "Move XML code to the common library"