Merge branch 'as/dir-c-cleanup'