Merge branch 'ak/bisect-reset-to-switch'