Merge "Fix comments for grep"