Update object.di

Fix issue 2396 and 8828.