Close #656 - fix find filter.
Merge remote-tracking branch 'upstream/master' into asynchandshake