Merge "Fix grep -f."