Don't return duplicate matches when matching empty strings. (#515944) Add