Merge branch 'bc/bisect-test-use-shell-path'