Merge "Fix backward compatibility issue for removed wildcard match rule"