Merge branch 'mh/safe-create-leading-directories'