Merge branch 'cnfline-templates' into cnfvar-deprecations