Issue #23863 support comma or space matching.