Cherry picking changes to xsl files