Merge branch 'sd/init-template'