Merge changes I10b0025b,I8e921e27 into main

* changes:
  Remove the ObjectManager::kill() function
  Rename ObjectManager field mObjects -> mObjectMgr