KAZOO-2242: FIxed an issue with directories
Merge remote-tracking branch 'origin/master'