Merge branch 'bw/dir-c-stops-relying-on-the-index'