Use wpIds when possible.
Merge remote-tracking branch 'origin/master'
Tweaks to disambiguator and similarity analyzer.