Merge branch 'ba/object-info' into maint