SUP-512 - changes to matching logic.