Restore |object|
auto-merge staging into master