Merge branch 'jt/unify-object-info'