Merge branch 'en/merge-recursive-oid-eq-simplify'