Merge changes from tmarc.xsl