Merge pull request #140 from Kunstmaan/remove-template-annotations

removed Template annotations (#14029)
Merge branch 'master' into remove-template-annotations

* master: