Merge branch 'jj/icase-directory'