Merge branch 'qp/bisect-docfix'