Fixes #9500 - matching uses the whole domain name
(cherry picked from commit ede6d4ea8b266e3a90fc6c639929be2b55be225c)
Fixes #9500 - matching uses the whole domain name
(cherry picked from commit ede6d4ea8b266e3a90fc6c639929be2b55be225c)