Merge "Fix small misconfiguration in E/// templates"