Adding latest template changes