updated from master, adding also some stuff specific to utc templates