refs #6721, #1337 full text search
reworking contact ids, fixing #7921
Merge branch 'dev' into test