Merge branch 'feat.ns.template' into develop