Merge branch 'jt/binsearch-with-fanout' into HEAD