Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint