templates ediatble by multiple paths
Merge branch 'feature-templateEditorUpdate'