added template-* fields
Merge origin/master