Merge "Make ObjectRegistry::InternalAdd GC safe"