Support for add directory
Merge commit 'bab7ab6f3392fa900e00fef71c536111834272b7'