Big update for both the new tracing system and mergeTemplate rules