Merge branch 'sw/safe-create-leading-dir-race'