fix zk-1795-nested-template
Merge branch 'zk-1795-nested-template'

Conflicts:
	zkdoc/release-note