Merge branch 'gt/unit-test-oid-array' into next