Revert "Fixed some warnings in ObjectService"

This reverts commit d5d3fa49f2e02eabb1326eee0de642a811c711ae.
Merge branch 'master' into experimental