remove deprecation warnings from templates
remove deprecation warnings from templates
Merge branch 'frontendbackend' into nbuild
Merge branch 'template_deprecation' into nbuild