template update
Partially merge PR #10175...

...from VlasovVitaly:pot-update3:

- template update