Merge branch 'sb/oid-object-info'