Merge branch 'nk/dir-c-comment-update'