Merge "Make ObjectRegistry::InternalAdd GC safe" into lmp-mr1-dev