All: update against templates (master)