ECT used as default templater
Merge origin/master