Merge "Add comments for grep (includes/installer/)"