Merge in template changes.