Merge branch 'cc/replace-object-info'