backported bug fix for searchSim
Merge branch 'release-master' into release-2.16