Additional template updates for Emmanuelle.