Merge branch 'bc/object-id'