Merge branch 'ready/edittemplate2'