Merge branch 'ma/bisect-leakfix' into maint