[kn xh] fuzzy update (master)
Templates: update (master)
All: update against templates