[#78420328] minor template changes