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