Merge skk/feature/dir_walking