Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint