Merge "Move XmlSelect to its own file"