updated template
Merge branch 'upg17'