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