Updated templates to TG 2.3.2