Template.created has now more use.
Merge branch 'pr-2681' into devel