fixes #8128 tag/group changelog search
Merge branch 'dev' into test
Simplified contact matching logic.
Merge branch 'dev' into test
Merge branch 'test' into prod