Merge branch 'mr/bisect-use-after-free'