Code

Merge branch 'gp/bisect-fix'