Merge branch 'nd/init-relative-template-fix' into maint