Templates: update (1.3)
Various: update against templates (1.3)