Merge branch 'ns/init-mkdir' into jch