Templates: update (2.1)
All: update against templates (2.1)