new MatchableEntity.toReferenceString
adding HeuristicFilter
Merge remote-tracking branch 'origin/master'