Merge "[277422] Enable concurrent usage of ClassImpl::addInstance"