Merge branch 'ns/init-mkdir'