Merge "Add/update comments for grep"