diff --git a/c-deps/libroach/protos/roachpb/data.pb.cc b/c-deps/libroach/protos/roachpb/data.pb.cc
index 649b9a65fac2..1ec8abd1d5b3 100644
--- a/c-deps/libroach/protos/roachpb/data.pb.cc
+++ b/c-deps/libroach/protos/roachpb/data.pb.cc
@@ -1983,16 +1983,16 @@ ::std::string MergeTrigger::GetTypeName() const {
 // ===================================================================
 
 void ChangeReplicasTrigger::InitAsDefaultInstance() {
-  ::cockroach::roachpb::_ChangeReplicasTrigger_default_instance_._instance.get_mutable()->replica_ = const_cast< ::cockroach::roachpb::ReplicaDescriptor*>(
+  ::cockroach::roachpb::_ChangeReplicasTrigger_default_instance_._instance.get_mutable()->deprecated_replica_ = const_cast< ::cockroach::roachpb::ReplicaDescriptor*>(
       ::cockroach::roachpb::ReplicaDescriptor::internal_default_instance());
   ::cockroach::roachpb::_ChangeReplicasTrigger_default_instance_._instance.get_mutable()->desc_ = const_cast< ::cockroach::roachpb::RangeDescriptor*>(
       ::cockroach::roachpb::RangeDescriptor::internal_default_instance());
 }
-void ChangeReplicasTrigger::clear_replica() {
-  if (GetArenaNoVirtual() == NULL && replica_ != NULL) {
-    delete replica_;
+void ChangeReplicasTrigger::clear_deprecated_replica() {
+  if (GetArenaNoVirtual() == NULL && deprecated_replica_ != NULL) {
+    delete deprecated_replica_;
   }
-  replica_ = NULL;
+  deprecated_replica_ = NULL;
 }
 void ChangeReplicasTrigger::clear_deprecated_updated_replicas() {
   deprecated_updated_replicas_.Clear();
@@ -2003,12 +2003,20 @@ void ChangeReplicasTrigger::clear_desc() {
   }
   desc_ = NULL;
 }
+void ChangeReplicasTrigger::clear_internal_added_replicas() {
+  internal_added_replicas_.Clear();
+}
+void ChangeReplicasTrigger::clear_internal_removed_replicas() {
+  internal_removed_replicas_.Clear();
+}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int ChangeReplicasTrigger::kChangeTypeFieldNumber;
-const int ChangeReplicasTrigger::kReplicaFieldNumber;
+const int ChangeReplicasTrigger::kDeprecatedChangeTypeFieldNumber;
+const int ChangeReplicasTrigger::kDeprecatedReplicaFieldNumber;
 const int ChangeReplicasTrigger::kDeprecatedUpdatedReplicasFieldNumber;
 const int ChangeReplicasTrigger::kDeprecatedNextReplicaIdFieldNumber;
 const int ChangeReplicasTrigger::kDescFieldNumber;
+const int ChangeReplicasTrigger::kInternalAddedReplicasFieldNumber;
+const int ChangeReplicasTrigger::kInternalRemovedReplicasFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 ChangeReplicasTrigger::ChangeReplicasTrigger()
@@ -2021,28 +2029,30 @@ ChangeReplicasTrigger::ChangeReplicasTrigger()
 ChangeReplicasTrigger::ChangeReplicasTrigger(const ChangeReplicasTrigger& from)
   : ::google::protobuf::MessageLite(),
       _internal_metadata_(NULL),
-      deprecated_updated_replicas_(from.deprecated_updated_replicas_) {
+      deprecated_updated_replicas_(from.deprecated_updated_replicas_),
+      internal_added_replicas_(from.internal_added_replicas_),
+      internal_removed_replicas_(from.internal_removed_replicas_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_replica()) {
-    replica_ = new ::cockroach::roachpb::ReplicaDescriptor(*from.replica_);
+  if (from.has_deprecated_replica()) {
+    deprecated_replica_ = new ::cockroach::roachpb::ReplicaDescriptor(*from.deprecated_replica_);
   } else {
-    replica_ = NULL;
+    deprecated_replica_ = NULL;
   }
   if (from.has_desc()) {
     desc_ = new ::cockroach::roachpb::RangeDescriptor(*from.desc_);
   } else {
     desc_ = NULL;
   }
-  ::memcpy(&change_type_, &from.change_type_,
+  ::memcpy(&deprecated_change_type_, &from.deprecated_change_type_,
     static_cast<size_t>(reinterpret_cast<char*>(&deprecated_next_replica_id_) -
-    reinterpret_cast<char*>(&change_type_)) + sizeof(deprecated_next_replica_id_));
+    reinterpret_cast<char*>(&deprecated_change_type_)) + sizeof(deprecated_next_replica_id_));
   // @@protoc_insertion_point(copy_constructor:cockroach.roachpb.ChangeReplicasTrigger)
 }
 
 void ChangeReplicasTrigger::SharedCtor() {
-  ::memset(&replica_, 0, static_cast<size_t>(
+  ::memset(&deprecated_replica_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&deprecated_next_replica_id_) -
-      reinterpret_cast<char*>(&replica_)) + sizeof(deprecated_next_replica_id_));
+      reinterpret_cast<char*>(&deprecated_replica_)) + sizeof(deprecated_next_replica_id_));
 }
 
 ChangeReplicasTrigger::~ChangeReplicasTrigger() {
@@ -2051,7 +2061,7 @@ ChangeReplicasTrigger::~ChangeReplicasTrigger() {
 }
 
 void ChangeReplicasTrigger::SharedDtor() {
-  if (this != internal_default_instance()) delete replica_;
+  if (this != internal_default_instance()) delete deprecated_replica_;
   if (this != internal_default_instance()) delete desc_;
 }
 
@@ -2071,17 +2081,19 @@ void ChangeReplicasTrigger::Clear() {
   (void) cached_has_bits;
 
   deprecated_updated_replicas_.Clear();
-  if (GetArenaNoVirtual() == NULL && replica_ != NULL) {
-    delete replica_;
+  internal_added_replicas_.Clear();
+  internal_removed_replicas_.Clear();
+  if (GetArenaNoVirtual() == NULL && deprecated_replica_ != NULL) {
+    delete deprecated_replica_;
   }
-  replica_ = NULL;
+  deprecated_replica_ = NULL;
   if (GetArenaNoVirtual() == NULL && desc_ != NULL) {
     delete desc_;
   }
   desc_ = NULL;
-  ::memset(&change_type_, 0, static_cast<size_t>(
+  ::memset(&deprecated_change_type_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&deprecated_next_replica_id_) -
-      reinterpret_cast<char*>(&change_type_)) + sizeof(deprecated_next_replica_id_));
+      reinterpret_cast<char*>(&deprecated_change_type_)) + sizeof(deprecated_next_replica_id_));
   _internal_metadata_.Clear();
 }
 
@@ -2101,7 +2113,7 @@ bool ChangeReplicasTrigger::MergePartialFromCodedStream(
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .cockroach.roachpb.ReplicaChangeType change_type = 1;
+      // .cockroach.roachpb.ReplicaChangeType deprecated_change_type = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -2109,7 +2121,7 @@ bool ChangeReplicasTrigger::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          set_change_type(static_cast< ::cockroach::roachpb::ReplicaChangeType >(value));
+          set_deprecated_change_type(static_cast< ::cockroach::roachpb::ReplicaChangeType >(value));
         } else {
           goto handle_unusual;
         }
@@ -2120,7 +2132,7 @@ bool ChangeReplicasTrigger::MergePartialFromCodedStream(
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_replica()));
+               input, mutable_deprecated_replica()));
         } else {
           goto handle_unusual;
         }
@@ -2163,6 +2175,28 @@ bool ChangeReplicasTrigger::MergePartialFromCodedStream(
         break;
       }
 
+      case 6: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+                input, add_internal_added_replicas()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      case 7: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(58u /* 58 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+                input, add_internal_removed_replicas()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -2189,15 +2223,15 @@ void ChangeReplicasTrigger::SerializeWithCachedSizes(
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .cockroach.roachpb.ReplicaChangeType change_type = 1;
-  if (this->change_type() != 0) {
+  // .cockroach.roachpb.ReplicaChangeType deprecated_change_type = 1;
+  if (this->deprecated_change_type() != 0) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->change_type(), output);
+      1, this->deprecated_change_type(), output);
   }
 
-  if (this->has_replica()) {
+  if (this->has_deprecated_replica()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessage(
-      2, this->_internal_replica(), output);
+      2, this->_internal_deprecated_replica(), output);
   }
 
   for (unsigned int i = 0,
@@ -2218,6 +2252,22 @@ void ChangeReplicasTrigger::SerializeWithCachedSizes(
       5, this->_internal_desc(), output);
   }
 
+  for (unsigned int i = 0,
+      n = static_cast<unsigned int>(this->internal_added_replicas_size()); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
+      6,
+      this->internal_added_replicas(static_cast<int>(i)),
+      output);
+  }
+
+  for (unsigned int i = 0,
+      n = static_cast<unsigned int>(this->internal_removed_replicas_size()); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
+      7,
+      this->internal_removed_replicas(static_cast<int>(i)),
+      output);
+  }
+
   output->WriteRaw((::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()).data(),
                    static_cast<int>((::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()).size()));
   // @@protoc_insertion_point(serialize_end:cockroach.roachpb.ChangeReplicasTrigger)
@@ -2239,10 +2289,30 @@ size_t ChangeReplicasTrigger::ByteSizeLong() const {
     }
   }
 
-  if (this->has_replica()) {
+  {
+    unsigned int count = static_cast<unsigned int>(this->internal_added_replicas_size());
+    total_size += 1UL * count;
+    for (unsigned int i = 0; i < count; i++) {
+      total_size +=
+        ::google::protobuf::internal::WireFormatLite::MessageSize(
+          this->internal_added_replicas(static_cast<int>(i)));
+    }
+  }
+
+  {
+    unsigned int count = static_cast<unsigned int>(this->internal_removed_replicas_size());
+    total_size += 1UL * count;
+    for (unsigned int i = 0; i < count; i++) {
+      total_size +=
+        ::google::protobuf::internal::WireFormatLite::MessageSize(
+          this->internal_removed_replicas(static_cast<int>(i)));
+    }
+  }
+
+  if (this->has_deprecated_replica()) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *replica_);
+        *deprecated_replica_);
   }
 
   // .cockroach.roachpb.RangeDescriptor desc = 5;
@@ -2252,10 +2322,10 @@ size_t ChangeReplicasTrigger::ByteSizeLong() const {
         *desc_);
   }
 
-  // .cockroach.roachpb.ReplicaChangeType change_type = 1;
-  if (this->change_type() != 0) {
+  // .cockroach.roachpb.ReplicaChangeType deprecated_change_type = 1;
+  if (this->deprecated_change_type() != 0) {
     total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->change_type());
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->deprecated_change_type());
   }
 
   if (this->deprecated_next_replica_id() != 0) {
@@ -2282,14 +2352,16 @@ void ChangeReplicasTrigger::MergeFrom(const ChangeReplicasTrigger& from) {
   (void) cached_has_bits;
 
   deprecated_updated_replicas_.MergeFrom(from.deprecated_updated_replicas_);
-  if (from.has_replica()) {
-    mutable_replica()->::cockroach::roachpb::ReplicaDescriptor::MergeFrom(from.replica());
+  internal_added_replicas_.MergeFrom(from.internal_added_replicas_);
+  internal_removed_replicas_.MergeFrom(from.internal_removed_replicas_);
+  if (from.has_deprecated_replica()) {
+    mutable_deprecated_replica()->::cockroach::roachpb::ReplicaDescriptor::MergeFrom(from.deprecated_replica());
   }
   if (from.has_desc()) {
     mutable_desc()->::cockroach::roachpb::RangeDescriptor::MergeFrom(from.desc());
   }
-  if (from.change_type() != 0) {
-    set_change_type(from.change_type());
+  if (from.deprecated_change_type() != 0) {
+    set_deprecated_change_type(from.deprecated_change_type());
   }
   if (from.deprecated_next_replica_id() != 0) {
     set_deprecated_next_replica_id(from.deprecated_next_replica_id());
@@ -2314,9 +2386,11 @@ void ChangeReplicasTrigger::Swap(ChangeReplicasTrigger* other) {
 void ChangeReplicasTrigger::InternalSwap(ChangeReplicasTrigger* other) {
   using std::swap;
   CastToBase(&deprecated_updated_replicas_)->InternalSwap(CastToBase(&other->deprecated_updated_replicas_));
-  swap(replica_, other->replica_);
+  CastToBase(&internal_added_replicas_)->InternalSwap(CastToBase(&other->internal_added_replicas_));
+  CastToBase(&internal_removed_replicas_)->InternalSwap(CastToBase(&other->internal_removed_replicas_));
+  swap(deprecated_replica_, other->deprecated_replica_);
   swap(desc_, other->desc_);
-  swap(change_type_, other->change_type_);
+  swap(deprecated_change_type_, other->deprecated_change_type_);
   swap(deprecated_next_replica_id_, other->deprecated_next_replica_id_);
   _internal_metadata_.Swap(&other->_internal_metadata_);
 }
diff --git a/c-deps/libroach/protos/roachpb/data.pb.h b/c-deps/libroach/protos/roachpb/data.pb.h
index e55a7cb8dcc0..32d981d48518 100644
--- a/c-deps/libroach/protos/roachpb/data.pb.h
+++ b/c-deps/libroach/protos/roachpb/data.pb.h
@@ -1017,16 +1017,38 @@ class ChangeReplicasTrigger : public ::google::protobuf::MessageLite /* @@protoc
   const ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >&
       deprecated_updated_replicas() const;
 
-  bool has_replica() const;
-  void clear_replica();
-  static const int kReplicaFieldNumber = 2;
+  int internal_added_replicas_size() const;
+  void clear_internal_added_replicas();
+  static const int kInternalAddedReplicasFieldNumber = 6;
+  ::cockroach::roachpb::ReplicaDescriptor* mutable_internal_added_replicas(int index);
+  ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >*
+      mutable_internal_added_replicas();
+  const ::cockroach::roachpb::ReplicaDescriptor& internal_added_replicas(int index) const;
+  ::cockroach::roachpb::ReplicaDescriptor* add_internal_added_replicas();
+  const ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >&
+      internal_added_replicas() const;
+
+  int internal_removed_replicas_size() const;
+  void clear_internal_removed_replicas();
+  static const int kInternalRemovedReplicasFieldNumber = 7;
+  ::cockroach::roachpb::ReplicaDescriptor* mutable_internal_removed_replicas(int index);
+  ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >*
+      mutable_internal_removed_replicas();
+  const ::cockroach::roachpb::ReplicaDescriptor& internal_removed_replicas(int index) const;
+  ::cockroach::roachpb::ReplicaDescriptor* add_internal_removed_replicas();
+  const ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >&
+      internal_removed_replicas() const;
+
+  bool has_deprecated_replica() const;
+  void clear_deprecated_replica();
+  static const int kDeprecatedReplicaFieldNumber = 2;
   private:
-  const ::cockroach::roachpb::ReplicaDescriptor& _internal_replica() const;
+  const ::cockroach::roachpb::ReplicaDescriptor& _internal_deprecated_replica() const;
   public:
-  const ::cockroach::roachpb::ReplicaDescriptor& replica() const;
-  ::cockroach::roachpb::ReplicaDescriptor* release_replica();
-  ::cockroach::roachpb::ReplicaDescriptor* mutable_replica();
-  void set_allocated_replica(::cockroach::roachpb::ReplicaDescriptor* replica);
+  const ::cockroach::roachpb::ReplicaDescriptor& deprecated_replica() const;
+  ::cockroach::roachpb::ReplicaDescriptor* release_deprecated_replica();
+  ::cockroach::roachpb::ReplicaDescriptor* mutable_deprecated_replica();
+  void set_allocated_deprecated_replica(::cockroach::roachpb::ReplicaDescriptor* deprecated_replica);
 
   // .cockroach.roachpb.RangeDescriptor desc = 5;
   bool has_desc() const;
@@ -1040,11 +1062,11 @@ class ChangeReplicasTrigger : public ::google::protobuf::MessageLite /* @@protoc
   ::cockroach::roachpb::RangeDescriptor* mutable_desc();
   void set_allocated_desc(::cockroach::roachpb::RangeDescriptor* desc);
 
-  // .cockroach.roachpb.ReplicaChangeType change_type = 1;
-  void clear_change_type();
-  static const int kChangeTypeFieldNumber = 1;
-  ::cockroach::roachpb::ReplicaChangeType change_type() const;
-  void set_change_type(::cockroach::roachpb::ReplicaChangeType value);
+  // .cockroach.roachpb.ReplicaChangeType deprecated_change_type = 1;
+  void clear_deprecated_change_type();
+  static const int kDeprecatedChangeTypeFieldNumber = 1;
+  ::cockroach::roachpb::ReplicaChangeType deprecated_change_type() const;
+  void set_deprecated_change_type(::cockroach::roachpb::ReplicaChangeType value);
 
   void clear_deprecated_next_replica_id();
   static const int kDeprecatedNextReplicaIdFieldNumber = 4;
@@ -1056,9 +1078,11 @@ class ChangeReplicasTrigger : public ::google::protobuf::MessageLite /* @@protoc
 
   ::google::protobuf::internal::InternalMetadataWithArenaLite _internal_metadata_;
   ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor > deprecated_updated_replicas_;
-  ::cockroach::roachpb::ReplicaDescriptor* replica_;
+  ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor > internal_added_replicas_;
+  ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor > internal_removed_replicas_;
+  ::cockroach::roachpb::ReplicaDescriptor* deprecated_replica_;
   ::cockroach::roachpb::RangeDescriptor* desc_;
-  int change_type_;
+  int deprecated_change_type_;
   ::google::protobuf::int32 deprecated_next_replica_id_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   friend struct ::protobuf_roachpb_2fdata_2eproto::TableStruct;
@@ -3333,65 +3357,65 @@ inline void MergeTrigger::set_allocated_freeze_start(::cockroach::util::hlc::Tim
 
 // ChangeReplicasTrigger
 
-// .cockroach.roachpb.ReplicaChangeType change_type = 1;
-inline void ChangeReplicasTrigger::clear_change_type() {
-  change_type_ = 0;
+// .cockroach.roachpb.ReplicaChangeType deprecated_change_type = 1;
+inline void ChangeReplicasTrigger::clear_deprecated_change_type() {
+  deprecated_change_type_ = 0;
 }
-inline ::cockroach::roachpb::ReplicaChangeType ChangeReplicasTrigger::change_type() const {
-  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.change_type)
-  return static_cast< ::cockroach::roachpb::ReplicaChangeType >(change_type_);
+inline ::cockroach::roachpb::ReplicaChangeType ChangeReplicasTrigger::deprecated_change_type() const {
+  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.deprecated_change_type)
+  return static_cast< ::cockroach::roachpb::ReplicaChangeType >(deprecated_change_type_);
 }
-inline void ChangeReplicasTrigger::set_change_type(::cockroach::roachpb::ReplicaChangeType value) {
+inline void ChangeReplicasTrigger::set_deprecated_change_type(::cockroach::roachpb::ReplicaChangeType value) {
   
-  change_type_ = value;
-  // @@protoc_insertion_point(field_set:cockroach.roachpb.ChangeReplicasTrigger.change_type)
+  deprecated_change_type_ = value;
+  // @@protoc_insertion_point(field_set:cockroach.roachpb.ChangeReplicasTrigger.deprecated_change_type)
 }
 
-inline bool ChangeReplicasTrigger::has_replica() const {
-  return this != internal_default_instance() && replica_ != NULL;
+inline bool ChangeReplicasTrigger::has_deprecated_replica() const {
+  return this != internal_default_instance() && deprecated_replica_ != NULL;
 }
-inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::_internal_replica() const {
-  return *replica_;
+inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::_internal_deprecated_replica() const {
+  return *deprecated_replica_;
 }
-inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::replica() const {
-  const ::cockroach::roachpb::ReplicaDescriptor* p = replica_;
-  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.replica)
+inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::deprecated_replica() const {
+  const ::cockroach::roachpb::ReplicaDescriptor* p = deprecated_replica_;
+  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.deprecated_replica)
   return p != NULL ? *p : *reinterpret_cast<const ::cockroach::roachpb::ReplicaDescriptor*>(
       &::cockroach::roachpb::_ReplicaDescriptor_default_instance_);
 }
-inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::release_replica() {
-  // @@protoc_insertion_point(field_release:cockroach.roachpb.ChangeReplicasTrigger.replica)
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::release_deprecated_replica() {
+  // @@protoc_insertion_point(field_release:cockroach.roachpb.ChangeReplicasTrigger.deprecated_replica)
   
-  ::cockroach::roachpb::ReplicaDescriptor* temp = replica_;
-  replica_ = NULL;
+  ::cockroach::roachpb::ReplicaDescriptor* temp = deprecated_replica_;
+  deprecated_replica_ = NULL;
   return temp;
 }
-inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::mutable_replica() {
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::mutable_deprecated_replica() {
   
-  if (replica_ == NULL) {
+  if (deprecated_replica_ == NULL) {
     auto* p = CreateMaybeMessage<::cockroach::roachpb::ReplicaDescriptor>(GetArenaNoVirtual());
-    replica_ = p;
+    deprecated_replica_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:cockroach.roachpb.ChangeReplicasTrigger.replica)
-  return replica_;
+  // @@protoc_insertion_point(field_mutable:cockroach.roachpb.ChangeReplicasTrigger.deprecated_replica)
+  return deprecated_replica_;
 }
-inline void ChangeReplicasTrigger::set_allocated_replica(::cockroach::roachpb::ReplicaDescriptor* replica) {
+inline void ChangeReplicasTrigger::set_allocated_deprecated_replica(::cockroach::roachpb::ReplicaDescriptor* deprecated_replica) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
-    delete reinterpret_cast< ::google::protobuf::MessageLite*>(replica_);
+    delete reinterpret_cast< ::google::protobuf::MessageLite*>(deprecated_replica_);
   }
-  if (replica) {
+  if (deprecated_replica) {
     ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
-      replica = ::google::protobuf::internal::GetOwnedMessage(
-          message_arena, replica, submessage_arena);
+      deprecated_replica = ::google::protobuf::internal::GetOwnedMessage(
+          message_arena, deprecated_replica, submessage_arena);
     }
     
   } else {
     
   }
-  replica_ = replica;
-  // @@protoc_insertion_point(field_set_allocated:cockroach.roachpb.ChangeReplicasTrigger.replica)
+  deprecated_replica_ = deprecated_replica;
+  // @@protoc_insertion_point(field_set_allocated:cockroach.roachpb.ChangeReplicasTrigger.deprecated_replica)
 }
 
 inline int ChangeReplicasTrigger::deprecated_updated_replicas_size() const {
@@ -3481,6 +3505,58 @@ inline void ChangeReplicasTrigger::set_allocated_desc(::cockroach::roachpb::Rang
   // @@protoc_insertion_point(field_set_allocated:cockroach.roachpb.ChangeReplicasTrigger.desc)
 }
 
+inline int ChangeReplicasTrigger::internal_added_replicas_size() const {
+  return internal_added_replicas_.size();
+}
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::mutable_internal_added_replicas(int index) {
+  // @@protoc_insertion_point(field_mutable:cockroach.roachpb.ChangeReplicasTrigger.internal_added_replicas)
+  return internal_added_replicas_.Mutable(index);
+}
+inline ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >*
+ChangeReplicasTrigger::mutable_internal_added_replicas() {
+  // @@protoc_insertion_point(field_mutable_list:cockroach.roachpb.ChangeReplicasTrigger.internal_added_replicas)
+  return &internal_added_replicas_;
+}
+inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::internal_added_replicas(int index) const {
+  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.internal_added_replicas)
+  return internal_added_replicas_.Get(index);
+}
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::add_internal_added_replicas() {
+  // @@protoc_insertion_point(field_add:cockroach.roachpb.ChangeReplicasTrigger.internal_added_replicas)
+  return internal_added_replicas_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >&
+ChangeReplicasTrigger::internal_added_replicas() const {
+  // @@protoc_insertion_point(field_list:cockroach.roachpb.ChangeReplicasTrigger.internal_added_replicas)
+  return internal_added_replicas_;
+}
+
+inline int ChangeReplicasTrigger::internal_removed_replicas_size() const {
+  return internal_removed_replicas_.size();
+}
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::mutable_internal_removed_replicas(int index) {
+  // @@protoc_insertion_point(field_mutable:cockroach.roachpb.ChangeReplicasTrigger.internal_removed_replicas)
+  return internal_removed_replicas_.Mutable(index);
+}
+inline ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >*
+ChangeReplicasTrigger::mutable_internal_removed_replicas() {
+  // @@protoc_insertion_point(field_mutable_list:cockroach.roachpb.ChangeReplicasTrigger.internal_removed_replicas)
+  return &internal_removed_replicas_;
+}
+inline const ::cockroach::roachpb::ReplicaDescriptor& ChangeReplicasTrigger::internal_removed_replicas(int index) const {
+  // @@protoc_insertion_point(field_get:cockroach.roachpb.ChangeReplicasTrigger.internal_removed_replicas)
+  return internal_removed_replicas_.Get(index);
+}
+inline ::cockroach::roachpb::ReplicaDescriptor* ChangeReplicasTrigger::add_internal_removed_replicas() {
+  // @@protoc_insertion_point(field_add:cockroach.roachpb.ChangeReplicasTrigger.internal_removed_replicas)
+  return internal_removed_replicas_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::cockroach::roachpb::ReplicaDescriptor >&
+ChangeReplicasTrigger::internal_removed_replicas() const {
+  // @@protoc_insertion_point(field_list:cockroach.roachpb.ChangeReplicasTrigger.internal_removed_replicas)
+  return internal_removed_replicas_;
+}
+
 // -------------------------------------------------------------------
 
 // ModifiedSpanTrigger
diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html
index 529f005fe137..57a39963451e 100644
--- a/docs/generated/settings/settings.html
+++ b/docs/generated/settings/settings.html
@@ -122,6 +122,6 @@
 <tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen in the /debug page</td></tr>
 <tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
 <tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'); ignored if trace.lightstep.token is set</td></tr>
-<tr><td><code>version</code></td><td>custom validation</td><td><code>19.1-7</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
+<tr><td><code>version</code></td><td>custom validation</td><td><code>19.1-8</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
 </tbody>
 </table>
diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go
index 9871401e71c5..d82c45e76243 100644
--- a/pkg/roachpb/data.go
+++ b/pkg/roachpb/data.go
@@ -22,6 +22,7 @@ import (
 	"math/rand"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -1301,10 +1302,48 @@ func writeTooOldRetryTimestamp(txn *Transaction, err *WriteTooOldError) hlc.Time
 var _ fmt.Stringer = &ChangeReplicasTrigger{}
 
 func (crt ChangeReplicasTrigger) String() string {
+	var nextReplicaID ReplicaID
+	var afterReplicas []ReplicaDescriptor
+	added, removed := crt.Added(), crt.Removed()
 	if crt.Desc != nil {
-		return fmt.Sprintf("%s(%s): updated=%s next=%d", crt.ChangeType, crt.Replica, crt.Desc.Replicas(), crt.Desc.NextReplicaID)
+		nextReplicaID = crt.Desc.NextReplicaID
+		// NB: we don't want to mutate InternalReplicas, so we don't call
+		// .Replicas()
+		//
+		// TODO(tbg): revisit after #39489 is merged.
+		afterReplicas = crt.Desc.InternalReplicas
+	} else {
+		nextReplicaID = crt.DeprecatedNextReplicaID
+		afterReplicas = crt.DeprecatedUpdatedReplicas
+	}
+	var chgS strings.Builder
+	if len(added) > 0 {
+		fmt.Fprintf(&chgS, "%s%s", ADD_REPLICA, added)
+	}
+	if len(removed) > 0 {
+		if chgS.Len() > 0 {
+			chgS.WriteString(", ")
+		}
+		fmt.Fprintf(&chgS, "%s%s", REMOVE_REPLICA, removed)
+	}
+	fmt.Fprintf(&chgS, ": after=%s next=%d", afterReplicas, nextReplicaID)
+	return chgS.String()
+}
+
+// Added returns the replicas added by this change (if there are any).
+func (crt ChangeReplicasTrigger) Added() []ReplicaDescriptor {
+	if len(crt.InternalAddedReplicas)+len(crt.InternalRemovedReplicas) == 0 && crt.DeprecatedChangeType == ADD_REPLICA {
+		return []ReplicaDescriptor{crt.DeprecatedReplica}
+	}
+	return crt.InternalAddedReplicas
+}
+
+// Removed returns the replicas removed by this change (if there are any).
+func (crt ChangeReplicasTrigger) Removed() []ReplicaDescriptor {
+	if len(crt.InternalAddedReplicas)+len(crt.InternalRemovedReplicas) == 0 && crt.DeprecatedChangeType == REMOVE_REPLICA {
+		return []ReplicaDescriptor{crt.DeprecatedReplica}
 	}
-	return fmt.Sprintf("%s(%s): updated=%s next=%d", crt.ChangeType, crt.Replica, crt.DeprecatedUpdatedReplicas, crt.DeprecatedNextReplicaID)
+	return crt.InternalRemovedReplicas
 }
 
 // LeaseSequence is a custom type for a lease sequence number.
diff --git a/pkg/roachpb/data.pb.go b/pkg/roachpb/data.pb.go
index 46e2d7295941..447a44003d3c 100644
--- a/pkg/roachpb/data.pb.go
+++ b/pkg/roachpb/data.pb.go
@@ -87,7 +87,7 @@ func (x ValueType) String() string {
 	return proto.EnumName(ValueType_name, int32(x))
 }
 func (ValueType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{0}
+	return fileDescriptor_data_cc95704a62d85cea, []int{0}
 }
 
 // ReplicaChangeType is a parameter of ChangeReplicasTrigger.
@@ -111,7 +111,7 @@ func (x ReplicaChangeType) String() string {
 	return proto.EnumName(ReplicaChangeType_name, int32(x))
 }
 func (ReplicaChangeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{1}
+	return fileDescriptor_data_cc95704a62d85cea, []int{1}
 }
 
 // TransactionStatus specifies possible states for a transaction.
@@ -163,7 +163,7 @@ func (x TransactionStatus) String() string {
 	return proto.EnumName(TransactionStatus_name, int32(x))
 }
 func (TransactionStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{2}
+	return fileDescriptor_data_cc95704a62d85cea, []int{2}
 }
 
 // Span is a key range with an inclusive start Key and an exclusive end Key.
@@ -180,7 +180,7 @@ type Span struct {
 func (m *Span) Reset()      { *m = Span{} }
 func (*Span) ProtoMessage() {}
 func (*Span) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{0}
+	return fileDescriptor_data_cc95704a62d85cea, []int{0}
 }
 func (m *Span) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -232,7 +232,7 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{1}
+	return fileDescriptor_data_cc95704a62d85cea, []int{1}
 }
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -268,7 +268,7 @@ func (m *KeyValue) Reset()         { *m = KeyValue{} }
 func (m *KeyValue) String() string { return proto.CompactTextString(m) }
 func (*KeyValue) ProtoMessage()    {}
 func (*KeyValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{2}
+	return fileDescriptor_data_cc95704a62d85cea, []int{2}
 }
 func (m *KeyValue) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -306,7 +306,7 @@ func (m *StoreIdent) Reset()         { *m = StoreIdent{} }
 func (m *StoreIdent) String() string { return proto.CompactTextString(m) }
 func (*StoreIdent) ProtoMessage()    {}
 func (*StoreIdent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{3}
+	return fileDescriptor_data_cc95704a62d85cea, []int{3}
 }
 func (m *StoreIdent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -346,7 +346,7 @@ func (m *SplitTrigger) Reset()         { *m = SplitTrigger{} }
 func (m *SplitTrigger) String() string { return proto.CompactTextString(m) }
 func (*SplitTrigger) ProtoMessage()    {}
 func (*SplitTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{4}
+	return fileDescriptor_data_cc95704a62d85cea, []int{4}
 }
 func (m *SplitTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -394,7 +394,7 @@ func (m *MergeTrigger) Reset()         { *m = MergeTrigger{} }
 func (m *MergeTrigger) String() string { return proto.CompactTextString(m) }
 func (*MergeTrigger) ProtoMessage()    {}
 func (*MergeTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{5}
+	return fileDescriptor_data_cc95704a62d85cea, []int{5}
 }
 func (m *MergeTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -420,9 +420,16 @@ func (m *MergeTrigger) XXX_DiscardUnknown() {
 var xxx_messageInfo_MergeTrigger proto.InternalMessageInfo
 
 type ChangeReplicasTrigger struct {
-	ChangeType ReplicaChangeType `protobuf:"varint,1,opt,name=change_type,json=changeType,proto3,enum=cockroach.roachpb.ReplicaChangeType" json:"change_type,omitempty"`
+	// TODO(tbg): remove once we know that no trigger using this will ever be
+	// applied (this will require something like #39182).
+	//
+	// TODO(tbg): when removing this, also rename internal_x_replicas to just
+	// x_replicas and remove the getter.
+	DeprecatedChangeType ReplicaChangeType `protobuf:"varint,1,opt,name=deprecated_change_type,json=deprecatedChangeType,proto3,enum=cockroach.roachpb.ReplicaChangeType" json:"deprecated_change_type,omitempty"`
 	// The replica being modified.
-	Replica ReplicaDescriptor `protobuf:"bytes,2,opt,name=replica,proto3" json:"replica"`
+	// TODO(tbg): remove once we know that no trigger using this will ever be
+	// applied (this will require something like #39182).
+	DeprecatedReplica ReplicaDescriptor `protobuf:"bytes,2,opt,name=deprecated_replica,json=deprecatedReplica,proto3" json:"deprecated_replica"`
 	// The new replica list with this change applied.
 	DeprecatedUpdatedReplicas []ReplicaDescriptor `protobuf:"bytes,3,rep,name=deprecated_updated_replicas,json=deprecatedUpdatedReplicas,proto3" json:"deprecated_updated_replicas"`
 	// The next replica id to use with this change applied.
@@ -433,12 +440,20 @@ type ChangeReplicasTrigger struct {
 	// TODO(jeffreyxiao): Remove deprecated_updated_replicas and
 	// deprecated_next_replica_id in 20.1.
 	Desc *RangeDescriptor `protobuf:"bytes,5,opt,name=desc,proto3" json:"desc,omitempty"`
+	// The new replicas added in this change (all reflected in desc, which is necessarily
+	// set when this field is used). Must not specify the same replica more than once or
+	// overlap with the removed replicas below.
+	InternalAddedReplicas []ReplicaDescriptor `protobuf:"bytes,6,rep,name=internal_added_replicas,json=internalAddedReplicas,proto3" json:"internal_added_replicas"`
+	// The replicas removed in this change (all reflected in desc, which is necessarily
+	// set when this field is used). Must not specify the same replica more than once or
+	// overlap with the added replicas above.
+	InternalRemovedReplicas []ReplicaDescriptor `protobuf:"bytes,7,rep,name=internal_removed_replicas,json=internalRemovedReplicas,proto3" json:"internal_removed_replicas"`
 }
 
 func (m *ChangeReplicasTrigger) Reset()      { *m = ChangeReplicasTrigger{} }
 func (*ChangeReplicasTrigger) ProtoMessage() {}
 func (*ChangeReplicasTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{6}
+	return fileDescriptor_data_cc95704a62d85cea, []int{6}
 }
 func (m *ChangeReplicasTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -480,7 +495,7 @@ func (m *ModifiedSpanTrigger) Reset()         { *m = ModifiedSpanTrigger{} }
 func (m *ModifiedSpanTrigger) String() string { return proto.CompactTextString(m) }
 func (*ModifiedSpanTrigger) ProtoMessage()    {}
 func (*ModifiedSpanTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{7}
+	return fileDescriptor_data_cc95704a62d85cea, []int{7}
 }
 func (m *ModifiedSpanTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -526,7 +541,7 @@ func (m *StickyBitTrigger) Reset()         { *m = StickyBitTrigger{} }
 func (m *StickyBitTrigger) String() string { return proto.CompactTextString(m) }
 func (*StickyBitTrigger) ProtoMessage()    {}
 func (*StickyBitTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{8}
+	return fileDescriptor_data_cc95704a62d85cea, []int{8}
 }
 func (m *StickyBitTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -565,7 +580,7 @@ func (m *InternalCommitTrigger) Reset()         { *m = InternalCommitTrigger{} }
 func (m *InternalCommitTrigger) String() string { return proto.CompactTextString(m) }
 func (*InternalCommitTrigger) ProtoMessage()    {}
 func (*InternalCommitTrigger) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{9}
+	return fileDescriptor_data_cc95704a62d85cea, []int{9}
 }
 func (m *InternalCommitTrigger) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -634,7 +649,7 @@ func (m *ObservedTimestamp) Reset()         { *m = ObservedTimestamp{} }
 func (m *ObservedTimestamp) String() string { return proto.CompactTextString(m) }
 func (*ObservedTimestamp) ProtoMessage()    {}
 func (*ObservedTimestamp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{10}
+	return fileDescriptor_data_cc95704a62d85cea, []int{10}
 }
 func (m *ObservedTimestamp) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -862,7 +877,7 @@ type Transaction struct {
 func (m *Transaction) Reset()      { *m = Transaction{} }
 func (*Transaction) ProtoMessage() {}
 func (*Transaction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{11}
+	return fileDescriptor_data_cc95704a62d85cea, []int{11}
 }
 func (m *Transaction) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -912,7 +927,7 @@ func (m *TransactionRecord) Reset()         { *m = TransactionRecord{} }
 func (m *TransactionRecord) String() string { return proto.CompactTextString(m) }
 func (*TransactionRecord) ProtoMessage()    {}
 func (*TransactionRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{12}
+	return fileDescriptor_data_cc95704a62d85cea, []int{12}
 }
 func (m *TransactionRecord) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -948,7 +963,7 @@ func (m *Intent) Reset()         { *m = Intent{} }
 func (m *Intent) String() string { return proto.CompactTextString(m) }
 func (*Intent) ProtoMessage()    {}
 func (*Intent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{13}
+	return fileDescriptor_data_cc95704a62d85cea, []int{13}
 }
 func (m *Intent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -985,7 +1000,7 @@ func (m *SequencedWrite) Reset()         { *m = SequencedWrite{} }
 func (m *SequencedWrite) String() string { return proto.CompactTextString(m) }
 func (*SequencedWrite) ProtoMessage()    {}
 func (*SequencedWrite) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{14}
+	return fileDescriptor_data_cc95704a62d85cea, []int{14}
 }
 func (m *SequencedWrite) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1049,7 +1064,7 @@ type Lease struct {
 func (m *Lease) Reset()      { *m = Lease{} }
 func (*Lease) ProtoMessage() {}
 func (*Lease) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{15}
+	return fileDescriptor_data_cc95704a62d85cea, []int{15}
 }
 func (m *Lease) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1094,7 +1109,7 @@ func (m *AbortSpanEntry) Reset()         { *m = AbortSpanEntry{} }
 func (m *AbortSpanEntry) String() string { return proto.CompactTextString(m) }
 func (*AbortSpanEntry) ProtoMessage()    {}
 func (*AbortSpanEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{16}
+	return fileDescriptor_data_cc95704a62d85cea, []int{16}
 }
 func (m *AbortSpanEntry) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1158,7 +1173,7 @@ func (m *TxnCoordMeta) Reset()         { *m = TxnCoordMeta{} }
 func (m *TxnCoordMeta) String() string { return proto.CompactTextString(m) }
 func (*TxnCoordMeta) ProtoMessage()    {}
 func (*TxnCoordMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_data_17df12a619763ecd, []int{17}
+	return fileDescriptor_data_cc95704a62d85cea, []int{17}
 }
 func (m *TxnCoordMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1339,10 +1354,10 @@ func (this *ChangeReplicasTrigger) Equal(that interface{}) bool {
 	} else if this == nil {
 		return false
 	}
-	if this.ChangeType != that1.ChangeType {
+	if this.DeprecatedChangeType != that1.DeprecatedChangeType {
 		return false
 	}
-	if !this.Replica.Equal(&that1.Replica) {
+	if !this.DeprecatedReplica.Equal(&that1.DeprecatedReplica) {
 		return false
 	}
 	if len(this.DeprecatedUpdatedReplicas) != len(that1.DeprecatedUpdatedReplicas) {
@@ -1359,6 +1374,22 @@ func (this *ChangeReplicasTrigger) Equal(that interface{}) bool {
 	if !this.Desc.Equal(that1.Desc) {
 		return false
 	}
+	if len(this.InternalAddedReplicas) != len(that1.InternalAddedReplicas) {
+		return false
+	}
+	for i := range this.InternalAddedReplicas {
+		if !this.InternalAddedReplicas[i].Equal(&that1.InternalAddedReplicas[i]) {
+			return false
+		}
+	}
+	if len(this.InternalRemovedReplicas) != len(that1.InternalRemovedReplicas) {
+		return false
+	}
+	for i := range this.InternalRemovedReplicas {
+		if !this.InternalRemovedReplicas[i].Equal(&that1.InternalRemovedReplicas[i]) {
+			return false
+		}
+	}
 	return true
 }
 func (this *ModifiedSpanTrigger) Equal(that interface{}) bool {
@@ -1912,15 +1943,15 @@ func (m *ChangeReplicasTrigger) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.ChangeType != 0 {
+	if m.DeprecatedChangeType != 0 {
 		dAtA[i] = 0x8
 		i++
-		i = encodeVarintData(dAtA, i, uint64(m.ChangeType))
+		i = encodeVarintData(dAtA, i, uint64(m.DeprecatedChangeType))
 	}
 	dAtA[i] = 0x12
 	i++
-	i = encodeVarintData(dAtA, i, uint64(m.Replica.Size()))
-	n10, err := m.Replica.MarshalTo(dAtA[i:])
+	i = encodeVarintData(dAtA, i, uint64(m.DeprecatedReplica.Size()))
+	n10, err := m.DeprecatedReplica.MarshalTo(dAtA[i:])
 	if err != nil {
 		return 0, err
 	}
@@ -1952,6 +1983,30 @@ func (m *ChangeReplicasTrigger) MarshalTo(dAtA []byte) (int, error) {
 		}
 		i += n11
 	}
+	if len(m.InternalAddedReplicas) > 0 {
+		for _, msg := range m.InternalAddedReplicas {
+			dAtA[i] = 0x32
+			i++
+			i = encodeVarintData(dAtA, i, uint64(msg.Size()))
+			n, err := msg.MarshalTo(dAtA[i:])
+			if err != nil {
+				return 0, err
+			}
+			i += n
+		}
+	}
+	if len(m.InternalRemovedReplicas) > 0 {
+		for _, msg := range m.InternalRemovedReplicas {
+			dAtA[i] = 0x3a
+			i++
+			i = encodeVarintData(dAtA, i, uint64(msg.Size()))
+			n, err := msg.MarshalTo(dAtA[i:])
+			if err != nil {
+				return 0, err
+			}
+			i += n
+		}
+	}
 	return i, nil
 }
 
@@ -2924,10 +2979,10 @@ func (m *ChangeReplicasTrigger) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.ChangeType != 0 {
-		n += 1 + sovData(uint64(m.ChangeType))
+	if m.DeprecatedChangeType != 0 {
+		n += 1 + sovData(uint64(m.DeprecatedChangeType))
 	}
-	l = m.Replica.Size()
+	l = m.DeprecatedReplica.Size()
 	n += 1 + l + sovData(uint64(l))
 	if len(m.DeprecatedUpdatedReplicas) > 0 {
 		for _, e := range m.DeprecatedUpdatedReplicas {
@@ -2942,6 +2997,18 @@ func (m *ChangeReplicasTrigger) Size() (n int) {
 		l = m.Desc.Size()
 		n += 1 + l + sovData(uint64(l))
 	}
+	if len(m.InternalAddedReplicas) > 0 {
+		for _, e := range m.InternalAddedReplicas {
+			l = e.Size()
+			n += 1 + l + sovData(uint64(l))
+		}
+	}
+	if len(m.InternalRemovedReplicas) > 0 {
+		for _, e := range m.InternalRemovedReplicas {
+			l = e.Size()
+			n += 1 + l + sovData(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -3987,9 +4054,9 @@ func (m *ChangeReplicasTrigger) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ChangeType", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedChangeType", wireType)
 			}
-			m.ChangeType = 0
+			m.DeprecatedChangeType = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowData
@@ -3999,14 +4066,14 @@ func (m *ChangeReplicasTrigger) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.ChangeType |= (ReplicaChangeType(b) & 0x7F) << shift
+				m.DeprecatedChangeType |= (ReplicaChangeType(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Replica", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field DeprecatedReplica", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -4030,7 +4097,7 @@ func (m *ChangeReplicasTrigger) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.Replica.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.DeprecatedReplica.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -4117,6 +4184,68 @@ func (m *ChangeReplicasTrigger) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field InternalAddedReplicas", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowData
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthData
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.InternalAddedReplicas = append(m.InternalAddedReplicas, ReplicaDescriptor{})
+			if err := m.InternalAddedReplicas[len(m.InternalAddedReplicas)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 7:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field InternalRemovedReplicas", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowData
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthData
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.InternalRemovedReplicas = append(m.InternalRemovedReplicas, ReplicaDescriptor{})
+			if err := m.InternalRemovedReplicas[len(m.InternalRemovedReplicas)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipData(dAtA[iNdEx:])
@@ -6160,137 +6289,140 @@ var (
 	ErrIntOverflowData   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("roachpb/data.proto", fileDescriptor_data_17df12a619763ecd) }
-
-var fileDescriptor_data_17df12a619763ecd = []byte{
-	// 2054 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x8f, 0x1b, 0x49,
-	0x15, 0x77, 0xbb, 0xdb, 0x76, 0xfb, 0xf9, 0x63, 0x7a, 0x2a, 0x99, 0xc4, 0x9b, 0x08, 0x3b, 0x38,
-	0x08, 0x42, 0xb4, 0xeb, 0x11, 0x09, 0xac, 0x44, 0x04, 0x08, 0x7f, 0x25, 0x69, 0x67, 0xec, 0xc9,
-	0xb6, 0x7b, 0x12, 0xed, 0x2e, 0x51, 0xd3, 0xee, 0xae, 0xb1, 0x9b, 0xd8, 0xdd, 0xde, 0xee, 0xf6,
-	0x64, 0xcc, 0x5f, 0xb0, 0x37, 0xf6, 0x88, 0x38, 0x45, 0xe2, 0xc6, 0x1d, 0x01, 0x17, 0xae, 0xe4,
-	0x84, 0x72, 0x63, 0xc5, 0xc1, 0x02, 0xe7, 0xc2, 0x99, 0x63, 0x24, 0x24, 0x54, 0xd5, 0xd5, 0xed,
-	0x9e, 0x8c, 0x33, 0xf2, 0x90, 0x45, 0xda, 0x8b, 0x5d, 0xf5, 0xea, 0xbd, 0x5f, 0x55, 0xbd, 0xef,
-	0x6a, 0x40, 0xae, 0xa3, 0x1b, 0xa3, 0xe9, 0x60, 0xd7, 0xd4, 0x7d, 0xbd, 0x36, 0x75, 0x1d, 0xdf,
-	0x41, 0xdb, 0x86, 0x63, 0x3c, 0xa5, 0xf4, 0x1a, 0x5b, 0xbd, 0x72, 0x29, 0x64, 0x9b, 0x60, 0x5f,
-	0x5f, 0xb1, 0x5e, 0xa9, 0x7a, 0xbe, 0xe3, 0xea, 0x43, 0xbc, 0x8b, 0xed, 0xa1, 0x65, 0x87, 0x7f,
-	0x84, 0xef, 0xc8, 0x30, 0x18, 0xcf, 0xf5, 0xb3, 0x78, 0x6e, 0x33, 0xa6, 0xd2, 0xcc, 0xb7, 0xc6,
-	0xbb, 0xa3, 0xb1, 0xb1, 0xeb, 0x5b, 0x13, 0xec, 0xf9, 0xfa, 0x64, 0xca, 0x56, 0x2e, 0x0e, 0x9d,
-	0xa1, 0x43, 0x87, 0xbb, 0x64, 0x14, 0x50, 0xab, 0x4f, 0x40, 0xe8, 0x4f, 0x75, 0x1b, 0xbd, 0x07,
-	0xfc, 0x53, 0x3c, 0x2f, 0xf1, 0xd7, 0xb8, 0x1b, 0xf9, 0x46, 0xe6, 0xf5, 0xa2, 0xc2, 0x3f, 0xc0,
-	0x73, 0x85, 0xd0, 0xd0, 0x35, 0xc8, 0x60, 0xdb, 0xd4, 0xc8, 0xb2, 0x70, 0x72, 0x39, 0x8d, 0x6d,
-	0xf3, 0x01, 0x9e, 0xdf, 0xc9, 0xff, 0xfa, 0x79, 0x25, 0xf1, 0xc7, 0xe7, 0x15, 0xee, 0x5f, 0xcf,
-	0x2b, 0x5c, 0x47, 0x10, 0x39, 0x29, 0xd9, 0x11, 0xc4, 0xa4, 0xc4, 0x57, 0x27, 0x90, 0x7a, 0xa4,
-	0x8f, 0x67, 0x18, 0x5d, 0x85, 0xac, 0xab, 0x3f, 0xd3, 0x06, 0x73, 0x1f, 0x7b, 0x25, 0x8e, 0xc0,
-	0x28, 0xa2, 0xab, 0x3f, 0x6b, 0x90, 0x39, 0xaa, 0x43, 0x36, 0x3a, 0x6d, 0x29, 0x79, 0x8d, 0xbb,
-	0x91, 0xbb, 0xf5, 0x8d, 0xda, 0x4a, 0x79, 0xe4, 0x4a, 0xb5, 0xd1, 0xd8, 0xa8, 0xa9, 0x21, 0x53,
-	0x43, 0x78, 0xb1, 0xa8, 0x24, 0x94, 0x95, 0xd4, 0x1d, 0x81, 0x6c, 0x5d, 0xfd, 0x14, 0xc4, 0x07,
-	0x78, 0x1e, 0xec, 0xc8, 0x6e, 0xc4, 0xad, 0xb9, 0xd1, 0xf7, 0x21, 0x75, 0x44, 0x78, 0xd8, 0x5e,
-	0xa5, 0xda, 0x29, 0x43, 0xd5, 0x28, 0x06, 0xdb, 0x26, 0x60, 0xae, 0xfe, 0x8d, 0x03, 0xe8, 0xfb,
-	0x8e, 0x8b, 0x65, 0x13, 0xdb, 0x3e, 0x1a, 0x02, 0x18, 0xe3, 0x99, 0xe7, 0x63, 0x57, 0xb3, 0x4c,
-	0xb6, 0xcd, 0x7d, 0xc2, 0xff, 0xf7, 0x45, 0xe5, 0xf6, 0xd0, 0xf2, 0x47, 0xb3, 0x41, 0xcd, 0x70,
-	0x26, 0xbb, 0x11, 0xb6, 0x39, 0x58, 0x8d, 0x77, 0xa7, 0x4f, 0x87, 0xbb, 0xd4, 0x54, 0xb3, 0x99,
-	0x65, 0xd6, 0x0e, 0x0e, 0xe4, 0xd6, 0x72, 0x51, 0xc9, 0x36, 0x03, 0x40, 0xb9, 0xa5, 0x64, 0x19,
-	0xb6, 0x6c, 0xa2, 0x0f, 0x20, 0x63, 0x3b, 0x26, 0x26, 0xbb, 0x90, 0xf3, 0xa6, 0x1a, 0x17, 0x97,
-	0x8b, 0x4a, 0xba, 0xe7, 0x98, 0x58, 0x6e, 0xbd, 0x8e, 0x46, 0x4a, 0x9a, 0x30, 0xc9, 0x26, 0xfa,
-	0x1e, 0x88, 0xc4, 0x51, 0x28, 0x3f, 0x4f, 0xf9, 0x2f, 0x2d, 0x17, 0x95, 0x4c, 0x70, 0x72, 0x22,
-	0x10, 0x0e, 0x95, 0x8c, 0x17, 0xdc, 0xa6, 0xfa, 0x3b, 0x0e, 0xf2, 0xfd, 0xe9, 0xd8, 0xf2, 0x55,
-	0xd7, 0x1a, 0x0e, 0xb1, 0x8b, 0xda, 0x90, 0x1d, 0xe3, 0x43, 0x5f, 0x33, 0xb1, 0x67, 0xd0, 0xab,
-	0xe5, 0x6e, 0x55, 0xd7, 0x28, 0x49, 0xd1, 0xed, 0x21, 0x6e, 0x61, 0xcf, 0x70, 0xad, 0xa9, 0xef,
-	0xb8, 0x4c, 0x5d, 0x22, 0x11, 0x25, 0x54, 0x74, 0x0f, 0xc0, 0xb5, 0x86, 0x23, 0x86, 0x93, 0x3c,
-	0x27, 0x4e, 0x96, 0xca, 0x12, 0x72, 0x60, 0xdd, 0x8e, 0x20, 0xf2, 0x92, 0x50, 0x5d, 0x26, 0x21,
-	0xdf, 0xc5, 0xee, 0x10, 0x7f, 0x4d, 0x0f, 0x8b, 0x6c, 0x90, 0x02, 0x20, 0x12, 0x97, 0x9a, 0xe7,
-	0xeb, 0xbe, 0x47, 0x03, 0x27, 0x77, 0xeb, 0xfd, 0x18, 0x1c, 0x0b, 0xe6, 0x5a, 0x10, 0xc5, 0xb5,
-	0x30, 0x98, 0x6b, 0xdd, 0x47, 0xcd, 0x66, 0x9f, 0xc8, 0x34, 0x2e, 0x11, 0xe0, 0xe5, 0xa2, 0x52,
-	0x54, 0x08, 0x5a, 0x44, 0x57, 0x8a, 0x14, 0xbd, 0x7b, 0x64, 0x18, 0x74, 0x8e, 0xee, 0x42, 0xfe,
-	0xd0, 0xc5, 0xf8, 0x97, 0x98, 0xec, 0xe5, 0xfa, 0xa5, 0xd4, 0xe6, 0x01, 0x94, 0x0b, 0x04, 0xfb,
-	0x44, 0xee, 0x84, 0x92, 0xff, 0xc4, 0xc3, 0x4e, 0x73, 0x44, 0x6e, 0xaa, 0xe0, 0xe9, 0xd8, 0x32,
-	0x74, 0x6f, 0xa5, 0xed, 0x9c, 0x41, 0x17, 0x34, 0x7f, 0x3e, 0xc5, 0x54, 0xdf, 0xc5, 0x5b, 0xdf,
-	0x5a, 0xa7, 0xa7, 0x40, 0x30, 0x40, 0x51, 0xe7, 0x53, 0xac, 0x80, 0x11, 0x8d, 0x51, 0x0b, 0x32,
-	0x6e, 0xc0, 0xc0, 0x54, 0x7d, 0x06, 0xc4, 0x29, 0x65, 0x87, 0xa2, 0xe8, 0x17, 0x70, 0xd5, 0xc4,
-	0x53, 0x17, 0x1b, 0xba, 0x8f, 0x4d, 0x6d, 0x36, 0x35, 0xe9, 0x3f, 0x5b, 0xf5, 0x4a, 0xfc, 0x35,
-	0xfe, 0x9c, 0xc8, 0xef, 0xad, 0xe0, 0x0e, 0x02, 0xb4, 0xf0, 0xfe, 0x08, 0xc3, 0x95, 0xd8, 0x5e,
-	0x36, 0x3e, 0xf6, 0xc3, 0x8d, 0x48, 0xa4, 0x09, 0x34, 0xd2, 0x6e, 0x2c, 0x17, 0x95, 0xcb, 0xad,
-	0x88, 0xab, 0x87, 0x8f, 0x7d, 0x26, 0x4f, 0x23, 0x2f, 0x1b, 0x4d, 0x94, 0xcb, 0xe6, 0x5a, 0x2e,
-	0x13, 0x7d, 0x08, 0x02, 0x75, 0xc0, 0xd4, 0xa6, 0x0e, 0xa8, 0x50, 0xfe, 0x3b, 0x22, 0xc9, 0xc1,
-	0x34, 0x09, 0x7e, 0xc1, 0xc1, 0x85, 0xae, 0x63, 0x5a, 0x87, 0x16, 0x36, 0x49, 0x6e, 0x0f, 0x2d,
-	0xf7, 0x3e, 0x20, 0x6f, 0xee, 0xf9, 0x78, 0xa2, 0x19, 0x8e, 0x7d, 0x68, 0x0d, 0x35, 0x6f, 0xaa,
-	0xdb, 0xd4, 0x80, 0xa2, 0x22, 0x05, 0x2b, 0x4d, 0xba, 0x40, 0x0b, 0x42, 0x1b, 0x10, 0xcd, 0x3a,
-	0x63, 0xeb, 0x08, 0xdb, 0xd8, 0xf3, 0x02, 0xee, 0xc0, 0x56, 0x97, 0xd7, 0x9c, 0x8a, 0x08, 0x29,
-	0x12, 0x11, 0xd9, 0x63, 0x12, 0x84, 0xc2, 0xf2, 0xf2, 0xcf, 0x40, 0xea, 0xfb, 0x96, 0xf1, 0x74,
-	0xde, 0x58, 0xe5, 0x98, 0x06, 0x80, 0x47, 0x69, 0xda, 0xc0, 0xf2, 0x59, 0xdc, 0x6e, 0x96, 0xf5,
-	0xbd, 0x10, 0x8a, 0xa1, 0xff, 0x99, 0x87, 0x1d, 0xd9, 0xf6, 0xb1, 0x6b, 0xeb, 0xe3, 0xa6, 0x33,
-	0x99, 0xac, 0xf6, 0x68, 0x41, 0xc1, 0x23, 0x79, 0x4d, 0xf3, 0x03, 0x02, 0xdb, 0xa6, 0xb2, 0xf6,
-	0xfc, 0xab, 0xfc, 0xa7, 0xe4, 0xbd, 0x78, 0x36, 0x6c, 0x41, 0x61, 0x42, 0x12, 0x4e, 0x84, 0x92,
-	0x7c, 0x2b, 0x4a, 0x3c, 0x31, 0x29, 0xf9, 0x49, 0x3c, 0x4d, 0xfd, 0x1c, 0x2e, 0xb3, 0xc0, 0x09,
-	0xfd, 0x33, 0xc2, 0xe3, 0x29, 0xde, 0x8d, 0x35, 0x78, 0x6b, 0x63, 0x50, 0xd9, 0x31, 0xd6, 0x86,
-	0xe6, 0x27, 0xb0, 0x33, 0x61, 0x76, 0xa7, 0xd6, 0x8a, 0xf0, 0x83, 0xec, 0xf3, 0xed, 0x75, 0xe7,
-	0x3d, 0xed, 0x27, 0xca, 0x85, 0xc9, 0x1a, 0xe7, 0xf9, 0x08, 0xd0, 0xca, 0x5a, 0x11, 0x70, 0xe0,
-	0xa4, 0xd7, 0xd7, 0xa9, 0xf3, 0x0d, 0x73, 0x2b, 0x92, 0xf7, 0x06, 0xe5, 0x8e, 0xf8, 0x39, 0xeb,
-	0x18, 0xaa, 0xbf, 0xe2, 0x60, 0x7b, 0x7f, 0xe0, 0x61, 0xf7, 0x08, 0x9b, 0x91, 0xb5, 0xe3, 0x75,
-	0x8f, 0xdb, 0xa0, 0xee, 0x7d, 0x05, 0x4d, 0x84, 0x18, 0xf6, 0x30, 0xd5, 0xdf, 0x67, 0x20, 0xa7,
-	0xba, 0xba, 0xed, 0xe9, 0x86, 0x6f, 0x39, 0x36, 0xba, 0x0f, 0x02, 0xe9, 0xd8, 0x98, 0xff, 0xdc,
-	0xdc, 0x20, 0x8f, 0xab, 0xc7, 0x76, 0x17, 0xfb, 0x7a, 0x43, 0x24, 0x9b, 0xbc, 0x5c, 0x54, 0x38,
-	0x85, 0x22, 0x20, 0x04, 0x82, 0xad, 0x4f, 0x82, 0xd6, 0x23, 0xab, 0xd0, 0x31, 0xfa, 0x11, 0xa4,
-	0x49, 0x99, 0x98, 0x05, 0x75, 0x62, 0x7d, 0x3a, 0x8d, 0x9d, 0xa6, 0x4f, 0x79, 0x15, 0x26, 0x83,
-	0x3a, 0x50, 0x1c, 0xeb, 0x9e, 0xaf, 0x8d, 0xb0, 0xee, 0xfa, 0x03, 0xac, 0x9f, 0xab, 0x02, 0x14,
-	0x88, 0xe8, 0xfd, 0x50, 0x92, 0x60, 0x39, 0xae, 0x35, 0xd4, 0x56, 0x9a, 0x4c, 0x9f, 0x03, 0x8b,
-	0x88, 0xae, 0xec, 0x77, 0x1f, 0x0a, 0x13, 0xfd, 0x38, 0x06, 0x95, 0xd9, 0x1c, 0x2a, 0x3f, 0xd1,
-	0x8f, 0x57, 0x48, 0x9f, 0xc2, 0x05, 0x87, 0xb9, 0xc7, 0x0a, 0xce, 0x2b, 0x89, 0x6f, 0x4d, 0xef,
-	0xa7, 0x9c, 0x89, 0xc1, 0x22, 0xe7, 0xcd, 0x05, 0x0f, 0xfd, 0x14, 0xf2, 0x96, 0xed, 0x63, 0xdb,
-	0xa7, 0x31, 0xe3, 0x95, 0x72, 0x14, 0xf5, 0x6d, 0x29, 0x2e, 0x2c, 0x9c, 0x81, 0x08, 0xa1, 0x78,
-	0xa8, 0x0a, 0x85, 0x67, 0xae, 0xe5, 0x63, 0xcd, 0x77, 0x1c, 0xcd, 0x19, 0x9b, 0xa5, 0x3c, 0xcd,
-	0xa9, 0x39, 0x4a, 0x54, 0x1d, 0x67, 0x7f, 0x6c, 0xa2, 0x27, 0x50, 0x8a, 0x55, 0x8f, 0x89, 0x65,
-	0xc7, 0xf4, 0x52, 0xdc, 0x5c, 0x2f, 0x97, 0x56, 0x20, 0x5d, 0xcb, 0x5e, 0x69, 0x48, 0x85, 0x0b,
-	0x2e, 0x3e, 0x74, 0xb1, 0x37, 0x8a, 0xab, 0xa8, 0xb4, 0xb5, 0x39, 0x32, 0x8a, 0xe4, 0x57, 0xa8,
-	0x3f, 0x86, 0xab, 0x27, 0xbd, 0x41, 0x7b, 0xa6, 0x7b, 0x5a, 0xa8, 0xc3, 0x92, 0x44, 0xaf, 0x59,
-	0x3a, 0x61, 0xf5, 0xc7, 0xba, 0x17, 0x2a, 0x1f, 0x7d, 0x04, 0x92, 0x65, 0x6b, 0x87, 0x63, 0xda,
-	0x0c, 0x51, 0x65, 0x78, 0xa5, 0x6d, 0xaa, 0xdd, 0x6f, 0xae, 0xd3, 0x2e, 0xfe, 0x6c, 0x86, 0x6d,
-	0x03, 0x9b, 0x8f, 0x09, 0x27, 0x3b, 0x55, 0xd1, 0xb2, 0xef, 0x52, 0x79, 0x4a, 0xf4, 0x4e, 0xbd,
-	0x34, 0x78, 0x49, 0xe8, 0x08, 0x62, 0x56, 0x82, 0x8e, 0x20, 0x16, 0xa4, 0x62, 0xf5, 0xaf, 0x3c,
-	0x6c, 0xc7, 0x22, 0x45, 0xc1, 0x86, 0xe3, 0x9a, 0x5f, 0x61, 0xf4, 0x7e, 0x7d, 0x22, 0xf5, 0xdd,
-	0xdd, 0xf6, 0xff, 0x60, 0x1e, 0x31, 0x66, 0x9a, 0xa4, 0xc4, 0x47, 0x06, 0x4a, 0x4b, 0x99, 0x8e,
-	0x20, 0x66, 0x24, 0xb1, 0x23, 0x88, 0xa2, 0x94, 0x8d, 0x4c, 0x06, 0x52, 0xae, 0x23, 0x88, 0x79,
-	0xa9, 0x10, 0x98, 0xaf, 0x23, 0x88, 0x45, 0x69, 0xab, 0x23, 0x88, 0x5b, 0x92, 0xd4, 0x11, 0x44,
-	0x49, 0xda, 0xae, 0xfe, 0x85, 0x83, 0xb4, 0x4c, 0x0f, 0x8d, 0x7e, 0x00, 0x42, 0xd4, 0xb1, 0x9c,
-	0x71, 0xd3, 0x98, 0xc9, 0x08, 0x3b, 0x6a, 0x00, 0xef, 0x1f, 0x87, 0x9d, 0xcb, 0x79, 0x6c, 0x1f,
-	0x5c, 0x91, 0x08, 0xc7, 0xcc, 0xce, 0x9f, 0xdf, 0xec, 0xac, 0x4b, 0xf9, 0x0d, 0x07, 0xc5, 0x93,
-	0x4a, 0x3c, 0xeb, 0x89, 0x6a, 0x80, 0xe8, 0x31, 0x66, 0xf6, 0xea, 0xbb, 0xf7, 0x7a, 0x51, 0x69,
-	0x6e, 0xf4, 0xae, 0x7c, 0xcb, 0x77, 0x02, 0x72, 0xb1, 0x3e, 0xfe, 0x4c, 0x89, 0x80, 0x63, 0xf5,
-	0xee, 0x3f, 0x3c, 0xa4, 0xf6, 0xb0, 0xee, 0x61, 0xf4, 0x43, 0x48, 0x05, 0xcf, 0x88, 0x73, 0x74,
-	0x64, 0x81, 0x04, 0x7a, 0x02, 0x80, 0x8f, 0xa7, 0x96, 0xab, 0x13, 0x1d, 0x6c, 0x56, 0x82, 0xcb,
-	0xff, 0x5e, 0x54, 0xae, 0xc4, 0x6e, 0x72, 0xa7, 0xea, 0xea, 0xb6, 0x69, 0xcf, 0xc6, 0x63, 0x7d,
-	0x30, 0xc6, 0x55, 0x25, 0x06, 0x18, 0x7f, 0x32, 0xf0, 0xff, 0xfb, 0x93, 0x61, 0x06, 0xb1, 0xd6,
-	0x3b, 0x78, 0x31, 0x91, 0x5f, 0xcf, 0x0a, 0x1f, 0x69, 0xef, 0x78, 0xe2, 0x9d, 0x15, 0x3a, 0x7d,
-	0x56, 0xf5, 0x29, 0x36, 0xea, 0x41, 0x6e, 0xea, 0x3a, 0x53, 0xc7, 0x23, 0xf9, 0xd9, 0xdb, 0x2c,
-	0xee, 0x8b, 0xcb, 0x45, 0x05, 0x1e, 0x32, 0x29, 0xb5, 0xaf, 0x40, 0x88, 0xa0, 0x7a, 0xe8, 0x22,
-	0xa4, 0xf0, 0xd4, 0x31, 0x46, 0xb4, 0x3e, 0xf3, 0x4a, 0x30, 0x41, 0x1f, 0xc4, 0xbc, 0x86, 0x54,
-	0x5b, 0xbe, 0xb1, 0xfd, 0x7a, 0x51, 0x29, 0x50, 0xcb, 0x86, 0xbe, 0x17, 0xb7, 0x7f, 0x98, 0x4d,
-	0xab, 0x4b, 0x0e, 0x8a, 0xf5, 0x81, 0xe3, 0xd2, 0xd4, 0xd0, 0xb6, 0x7d, 0x77, 0x7e, 0x96, 0x73,
-	0xbe, 0x7b, 0xab, 0x85, 0x46, 0x20, 0x4e, 0x5d, 0xcb, 0x71, 0x2d, 0x7f, 0xce, 0xbe, 0x52, 0xec,
-	0xbd, 0x5e, 0x54, 0xee, 0xbf, 0xab, 0x7f, 0x3f, 0x64, 0x98, 0x4a, 0x84, 0x1e, 0x77, 0xf2, 0x24,
-	0xe4, 0xd5, 0x63, 0xbb, 0xe9, 0x38, 0xae, 0x49, 0x22, 0x1c, 0x7d, 0x18, 0xa4, 0x86, 0xc0, 0xd3,
-	0xcb, 0x67, 0xc7, 0x74, 0x3c, 0x1d, 0x5c, 0x87, 0x82, 0xe1, 0x4c, 0x26, 0xba, 0x6d, 0x6a, 0x86,
-	0x33, 0xb3, 0xfd, 0xe0, 0x06, 0x4a, 0x9e, 0x11, 0x9b, 0x84, 0x86, 0x1a, 0x50, 0x60, 0x25, 0x55,
-	0x73, 0xb1, 0x6e, 0x12, 0xf7, 0xda, 0x20, 0x43, 0xe7, 0x99, 0x8c, 0x42, 0x44, 0x50, 0x0b, 0x8a,
-	0x21, 0x06, 0x4b, 0xd0, 0xa9, 0x4d, 0x40, 0xc2, 0x8d, 0x83, 0xac, 0x8c, 0xbe, 0x03, 0x5b, 0x21,
-	0x8a, 0x65, 0x1f, 0xe9, 0x63, 0xcb, 0xa4, 0xce, 0x21, 0x2a, 0x21, 0xb8, 0x1c, 0x50, 0xd7, 0x56,
-	0x04, 0xf1, 0x9d, 0x2a, 0x42, 0x54, 0x07, 0xd2, 0x52, 0xe6, 0xe6, 0x1f, 0x38, 0xc8, 0xd2, 0xef,
-	0x6a, 0xf4, 0x0b, 0x40, 0x0e, 0x32, 0x07, 0xbd, 0x07, 0xbd, 0xfd, 0xc7, 0x3d, 0x29, 0x81, 0x32,
-	0xc0, 0xcb, 0x3d, 0x55, 0xe2, 0x50, 0x16, 0x52, 0x77, 0xf7, 0xf6, 0xeb, 0xaa, 0x94, 0x24, 0xc3,
-	0xc6, 0xc7, 0x6a, 0xbb, 0x2f, 0xf1, 0xe8, 0x02, 0x6c, 0xb5, 0xda, 0x7b, 0x72, 0x57, 0x56, 0xdb,
-	0x2d, 0x2d, 0x20, 0x8a, 0x48, 0x04, 0x41, 0x95, 0xbb, 0x6d, 0x49, 0x20, 0x50, 0xad, 0x76, 0x53,
-	0xee, 0xd6, 0xf7, 0xa4, 0x14, 0xda, 0x81, 0xed, 0x15, 0x6f, 0x48, 0xce, 0xa2, 0x3c, 0x88, 0xad,
-	0x03, 0xa5, 0xae, 0xca, 0xfb, 0x3d, 0x29, 0x4d, 0xb0, 0xd5, 0x83, 0x87, 0x7b, 0x6d, 0x09, 0xc8,
-	0x42, 0x43, 0x56, 0xeb, 0x8a, 0x52, 0xff, 0x58, 0xca, 0xa1, 0x22, 0x00, 0x01, 0xed, 0xb7, 0x15,
-	0xb9, 0xdd, 0x97, 0xcc, 0x2a, 0xa9, 0x5a, 0x99, 0x9b, 0x3f, 0x81, 0xed, 0x53, 0x9f, 0x33, 0xd0,
-	0x16, 0xe4, 0xea, 0xad, 0x96, 0xa6, 0xb4, 0x1f, 0xee, 0xc9, 0xcd, 0xba, 0x94, 0x40, 0x08, 0x8a,
-	0x4a, 0xbb, 0xbb, 0xff, 0xa8, 0x1d, 0xd1, 0xb8, 0x2b, 0xc2, 0xe7, 0xbf, 0x2d, 0x27, 0x6e, 0xee,
-	0x9f, 0xe8, 0x4a, 0x82, 0xf2, 0x40, 0x4e, 0xfd, 0xb0, 0xdd, 0x6b, 0xc9, 0xbd, 0x7b, 0x52, 0x82,
-	0x4c, 0xfa, 0x6a, 0xfd, 0x1e, 0x99, 0xf0, 0xa8, 0x00, 0xd9, 0xe6, 0x7e, 0xb7, 0x2b, 0xab, 0x6a,
-	0xbb, 0x25, 0x71, 0x64, 0xad, 0xde, 0xd8, 0x57, 0xc8, 0x24, 0x19, 0x00, 0x36, 0xbe, 0xfb, 0xe2,
-	0x9f, 0xe5, 0xc4, 0x8b, 0x65, 0x99, 0x7b, 0xb9, 0x2c, 0x73, 0x5f, 0x2e, 0xcb, 0xdc, 0x3f, 0x96,
-	0x65, 0xee, 0x8b, 0x57, 0xe5, 0xc4, 0xcb, 0x57, 0xe5, 0xc4, 0x97, 0xaf, 0xca, 0x89, 0x4f, 0x32,
-	0xcc, 0x4c, 0x83, 0x34, 0xfd, 0xd0, 0x7b, 0xfb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0x81,
-	0x09, 0x23, 0xa2, 0x16, 0x00, 0x00,
+func init() { proto.RegisterFile("roachpb/data.proto", fileDescriptor_data_cc95704a62d85cea) }
+
+var fileDescriptor_data_cc95704a62d85cea = []byte{
+	// 2110 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0x37, 0x4d, 0x4a, 0xa2, 0x9e, 0x3e, 0x4c, 0x4f, 0xe2, 0x44, 0x49, 0x50, 0x29, 0x55, 0x8a,
+	0x36, 0x0d, 0x76, 0x65, 0x34, 0x69, 0x17, 0x68, 0xd0, 0x16, 0xd5, 0x57, 0x12, 0x29, 0x96, 0x9d,
+	0x1d, 0xd1, 0x09, 0xb2, 0xdb, 0x80, 0xa5, 0xc8, 0xb1, 0xcc, 0x46, 0x22, 0xb5, 0x24, 0xe5, 0x58,
+	0xfd, 0x0b, 0xf6, 0xd6, 0x3d, 0x16, 0x3d, 0x05, 0xe8, 0xad, 0x97, 0x9e, 0x8a, 0xf6, 0xd4, 0x6b,
+	0x73, 0x2a, 0x72, 0xeb, 0xa2, 0x07, 0xa1, 0x55, 0x2e, 0x3d, 0xf7, 0x18, 0xa0, 0x40, 0x31, 0xc3,
+	0x21, 0x45, 0xc7, 0x8a, 0x21, 0xc1, 0xbb, 0xc0, 0x5e, 0x24, 0xf2, 0xcd, 0x7b, 0xbf, 0x37, 0xf3,
+	0xbe, 0x87, 0x80, 0x5c, 0x47, 0x37, 0x0e, 0x47, 0xbd, 0x6d, 0x53, 0xf7, 0xf5, 0xca, 0xc8, 0x75,
+	0x7c, 0x07, 0x6d, 0x1a, 0x8e, 0xf1, 0x9c, 0xd1, 0x2b, 0x7c, 0xf5, 0xea, 0xa5, 0x90, 0x6d, 0x48,
+	0x7c, 0x7d, 0xce, 0x7a, 0xb5, 0xec, 0xf9, 0x8e, 0xab, 0xf7, 0xc9, 0x36, 0xb1, 0xfb, 0x96, 0x1d,
+	0xfe, 0x51, 0xbe, 0x23, 0xc3, 0xe0, 0x3c, 0x37, 0xce, 0xe2, 0xb9, 0xc3, 0x99, 0x0a, 0x63, 0xdf,
+	0x1a, 0x6c, 0x1f, 0x0e, 0x8c, 0x6d, 0xdf, 0x1a, 0x12, 0xcf, 0xd7, 0x87, 0x23, 0xbe, 0x72, 0xb1,
+	0xef, 0xf4, 0x1d, 0xf6, 0xb8, 0x4d, 0x9f, 0x02, 0x6a, 0xf9, 0x19, 0x48, 0xdd, 0x91, 0x6e, 0xa3,
+	0x2b, 0x20, 0x3e, 0x27, 0x93, 0x82, 0x78, 0x5d, 0xb8, 0x99, 0xad, 0xa5, 0xde, 0x4e, 0x4b, 0xe2,
+	0x43, 0x32, 0xc1, 0x94, 0x86, 0xae, 0x43, 0x8a, 0xd8, 0xa6, 0x46, 0x97, 0xa5, 0x93, 0xcb, 0x49,
+	0x62, 0x9b, 0x0f, 0xc9, 0xe4, 0x6e, 0xf6, 0xb7, 0x2f, 0x4b, 0x6b, 0x7f, 0x79, 0x59, 0x12, 0xfe,
+	0xf3, 0xb2, 0x24, 0xb4, 0x25, 0x59, 0x50, 0xd6, 0xdb, 0x92, 0xbc, 0xae, 0x88, 0xe5, 0x21, 0x24,
+	0x1e, 0xeb, 0x83, 0x31, 0x41, 0xd7, 0x20, 0xed, 0xea, 0x2f, 0xb4, 0xde, 0xc4, 0x27, 0x5e, 0x41,
+	0xa0, 0x30, 0x58, 0x76, 0xf5, 0x17, 0x35, 0xfa, 0x8e, 0xaa, 0x90, 0x8e, 0x76, 0x5b, 0x58, 0xbf,
+	0x2e, 0xdc, 0xcc, 0xdc, 0xfe, 0x56, 0x65, 0x6e, 0x3c, 0x7a, 0xa4, 0xca, 0xe1, 0xc0, 0xa8, 0xa8,
+	0x21, 0x53, 0x4d, 0x7a, 0x35, 0x2d, 0xad, 0xe1, 0xb9, 0xd4, 0x5d, 0x89, 0xaa, 0x2e, 0x7f, 0x0a,
+	0xf2, 0x43, 0x32, 0x09, 0x34, 0xf2, 0x13, 0x09, 0x0b, 0x4e, 0xf4, 0x43, 0x48, 0x1c, 0x51, 0x1e,
+	0xae, 0xab, 0x50, 0x39, 0xe5, 0xa8, 0x0a, 0xc3, 0xe0, 0x6a, 0x02, 0xe6, 0xf2, 0x3f, 0x04, 0x80,
+	0xae, 0xef, 0xb8, 0xa4, 0x65, 0x12, 0xdb, 0x47, 0x7d, 0x00, 0x63, 0x30, 0xf6, 0x7c, 0xe2, 0x6a,
+	0x96, 0xc9, 0xd5, 0x3c, 0xa0, 0xfc, 0xff, 0x9c, 0x96, 0xee, 0xf4, 0x2d, 0xff, 0x70, 0xdc, 0xab,
+	0x18, 0xce, 0x70, 0x3b, 0xc2, 0x36, 0x7b, 0xf3, 0xe7, 0xed, 0xd1, 0xf3, 0xfe, 0x36, 0x73, 0xd5,
+	0x78, 0x6c, 0x99, 0x95, 0xfd, 0xfd, 0x56, 0x63, 0x36, 0x2d, 0xa5, 0xeb, 0x01, 0x60, 0xab, 0x81,
+	0xd3, 0x1c, 0xbb, 0x65, 0xa2, 0x0f, 0x21, 0x65, 0x3b, 0x26, 0xa1, 0x5a, 0xe8, 0x7e, 0x13, 0xb5,
+	0x8b, 0xb3, 0x69, 0x29, 0xb9, 0xeb, 0x98, 0xa4, 0xd5, 0x78, 0x1b, 0x3d, 0xe1, 0x24, 0x65, 0x6a,
+	0x99, 0xe8, 0x07, 0x20, 0xd3, 0x40, 0x61, 0xfc, 0x22, 0xe3, 0xbf, 0x34, 0x9b, 0x96, 0x52, 0xc1,
+	0xce, 0xa9, 0x40, 0xf8, 0x88, 0x53, 0x5e, 0x70, 0x9a, 0xf2, 0x1f, 0x04, 0xc8, 0x76, 0x47, 0x03,
+	0xcb, 0x57, 0x5d, 0xab, 0xdf, 0x27, 0x2e, 0x6a, 0x42, 0x7a, 0x40, 0x0e, 0x7c, 0xcd, 0x24, 0x9e,
+	0xc1, 0x8e, 0x96, 0xb9, 0x5d, 0x5e, 0x60, 0x24, 0xac, 0xdb, 0x7d, 0xd2, 0x20, 0x9e, 0xe1, 0x5a,
+	0x23, 0xdf, 0x71, 0xb9, 0xb9, 0x64, 0x2a, 0x4a, 0xa9, 0xe8, 0x3e, 0x80, 0x6b, 0xf5, 0x0f, 0x39,
+	0xce, 0xfa, 0x8a, 0x38, 0x69, 0x26, 0x4b, 0xc9, 0x81, 0x77, 0xdb, 0x92, 0x2c, 0x2a, 0x52, 0x79,
+	0xb6, 0x0e, 0xd9, 0x0e, 0x71, 0xfb, 0xe4, 0x1b, 0xba, 0x59, 0x64, 0x83, 0x12, 0x00, 0xd1, 0xbc,
+	0xd4, 0x3c, 0x5f, 0xf7, 0x3d, 0x96, 0x38, 0x99, 0xdb, 0x1f, 0xc4, 0xe0, 0x78, 0x32, 0x57, 0x82,
+	0x2c, 0xae, 0x84, 0xc9, 0x5c, 0xe9, 0x3c, 0xae, 0xd7, 0xbb, 0x54, 0xa6, 0x76, 0x89, 0x02, 0xcf,
+	0xa6, 0xa5, 0x3c, 0xa6, 0x68, 0x11, 0x1d, 0xe7, 0x19, 0x7a, 0xe7, 0xc8, 0x30, 0xd8, 0x3b, 0xba,
+	0x07, 0xd9, 0x03, 0x97, 0x90, 0x5f, 0x13, 0xaa, 0xcb, 0xf5, 0x0b, 0x89, 0xe5, 0x13, 0x28, 0x13,
+	0x08, 0x76, 0xa9, 0xdc, 0x09, 0x23, 0xff, 0x31, 0x01, 0x5b, 0xf5, 0x43, 0x7a, 0x52, 0x4c, 0x46,
+	0x03, 0xcb, 0xd0, 0xbd, 0xd0, 0xda, 0x9f, 0xc0, 0x25, 0x93, 0x8c, 0x5c, 0x62, 0xe8, 0x3e, 0x31,
+	0x35, 0x83, 0xf1, 0x68, 0xfe, 0x64, 0x44, 0x98, 0xe9, 0xf3, 0xb7, 0xbf, 0xb3, 0xc8, 0x64, 0x01,
+	0x46, 0x00, 0xa8, 0x4e, 0x46, 0x04, 0x5f, 0x9c, 0x63, 0xcc, 0xa9, 0xe8, 0x29, 0xa0, 0x18, 0xb6,
+	0x1b, 0x48, 0x71, 0x57, 0x9c, 0x81, 0x7b, 0xca, 0x19, 0x9b, 0x73, 0x14, 0xce, 0x82, 0x7e, 0x05,
+	0xd7, 0x62, 0xd0, 0xe3, 0x91, 0x19, 0x57, 0xe1, 0x15, 0xc4, 0xeb, 0xe2, 0x8a, 0x3a, 0xae, 0xcc,
+	0xe1, 0xf6, 0x03, 0xb4, 0xd0, 0x52, 0x88, 0xc0, 0xd5, 0x98, 0x2e, 0x9b, 0x1c, 0xfb, 0xa1, 0x22,
+	0x9a, 0x93, 0x12, 0xcb, 0xc9, 0x9b, 0xb3, 0x69, 0xe9, 0x72, 0x23, 0xe2, 0xda, 0x25, 0xc7, 0x3e,
+	0x97, 0x67, 0x39, 0x9a, 0x8e, 0x5e, 0xf0, 0x65, 0x73, 0x21, 0x97, 0x89, 0x3e, 0x02, 0x89, 0x85,
+	0x6a, 0x62, 0xd9, 0x50, 0xc5, 0x8c, 0x1f, 0xf5, 0xe0, 0xb2, 0x65, 0xfb, 0xc4, 0xb5, 0xf5, 0x81,
+	0xa6, 0x9b, 0x66, 0xdc, 0x0c, 0xc9, 0x95, 0xcd, 0xb0, 0x15, 0x42, 0x55, 0x29, 0x52, 0x64, 0x82,
+	0x03, 0xb8, 0x12, 0xe9, 0x70, 0xc9, 0xd0, 0x39, 0x8a, 0x6b, 0x49, 0xad, 0xac, 0x25, 0xda, 0x30,
+	0x0e, 0xb0, 0x42, 0x3d, 0x77, 0x65, 0xda, 0x79, 0x58, 0xe9, 0xff, 0x42, 0x80, 0x0b, 0x1d, 0xc7,
+	0xb4, 0x0e, 0x2c, 0x62, 0xd2, 0x8e, 0x16, 0xc6, 0xeb, 0x07, 0x80, 0xbc, 0x89, 0xe7, 0x93, 0xa1,
+	0x66, 0x38, 0xf6, 0x81, 0xd5, 0xd7, 0xbc, 0x91, 0x6e, 0xb3, 0x58, 0x95, 0xb1, 0x12, 0xac, 0xd4,
+	0xd9, 0x02, 0x6b, 0x83, 0x4d, 0x40, 0xac, 0xd6, 0x0e, 0xac, 0x23, 0x62, 0x13, 0xcf, 0x0b, 0xb8,
+	0x83, 0x08, 0xbc, 0xbc, 0x60, 0xc3, 0x54, 0x08, 0x2b, 0x54, 0x64, 0x87, 0x4b, 0x50, 0x0a, 0xef,
+	0x46, 0xbf, 0x00, 0xa5, 0xeb, 0x5b, 0xc6, 0xf3, 0x49, 0x6d, 0x5e, 0x59, 0x6b, 0x00, 0x1e, 0xa3,
+	0x69, 0x3d, 0xcb, 0xe7, 0xd5, 0x6a, 0xb9, 0x5e, 0xe7, 0x85, 0x50, 0x1c, 0xfd, 0xaf, 0x22, 0x6c,
+	0xb5, 0xb8, 0x59, 0xea, 0xce, 0x70, 0x38, 0xd7, 0xd1, 0x80, 0x9c, 0x47, 0xab, 0xb9, 0xe6, 0x07,
+	0x04, 0xae, 0xa6, 0xb4, 0x70, 0xff, 0xf3, 0xaa, 0x8f, 0xb3, 0x5e, 0xbc, 0x07, 0x34, 0x20, 0x37,
+	0xa4, 0x65, 0x36, 0x42, 0x59, 0x7f, 0x2f, 0x4a, 0xbc, 0x1c, 0xe3, 0xec, 0x30, 0x5e, 0x9c, 0x7f,
+	0x09, 0x97, 0x79, 0x8d, 0x08, 0xdd, 0x1f, 0xe1, 0x89, 0x0c, 0xef, 0xe6, 0x02, 0xbc, 0x85, 0x95,
+	0x07, 0x6f, 0x19, 0xef, 0x29, 0x48, 0x5b, 0x43, 0xee, 0x77, 0xe6, 0xad, 0x08, 0x3f, 0xa8, 0xb9,
+	0xdf, 0x5d, 0xb4, 0xdf, 0xd3, 0x71, 0x82, 0x2f, 0x0c, 0x17, 0x04, 0xcf, 0xc7, 0x80, 0xe6, 0xde,
+	0x8a, 0x80, 0x83, 0x84, 0xbb, 0xb1, 0xc8, 0x9c, 0xef, 0xb8, 0x1b, 0x2b, 0xde, 0x3b, 0x94, 0xbb,
+	0xf2, 0xe7, 0x7c, 0x4e, 0x2a, 0xff, 0x46, 0x80, 0xcd, 0xbd, 0x9e, 0x47, 0xdc, 0x23, 0x62, 0x46,
+	0xde, 0x8e, 0x77, 0x7b, 0x61, 0x89, 0x6e, 0xff, 0x15, 0x8c, 0x4e, 0x72, 0x38, 0xb9, 0x95, 0xff,
+	0x94, 0x82, 0x8c, 0xea, 0xea, 0xb6, 0xa7, 0x1b, 0xbe, 0xe5, 0xd8, 0xe8, 0x01, 0x48, 0x74, 0x4e,
+	0xe5, 0xf1, 0x73, 0x6b, 0x89, 0xee, 0xa5, 0x1e, 0xdb, 0x1d, 0xe2, 0xeb, 0x35, 0x99, 0x2a, 0x79,
+	0x3d, 0x2d, 0x09, 0x98, 0x21, 0x20, 0x04, 0x92, 0xad, 0x0f, 0x83, 0x81, 0x2b, 0x8d, 0xd9, 0x33,
+	0xfa, 0x09, 0x24, 0x69, 0x73, 0x1c, 0x07, 0xdd, 0x71, 0x71, 0xe7, 0x88, 0xed, 0xa6, 0xcb, 0x78,
+	0x31, 0x97, 0x41, 0x6d, 0xc8, 0x0f, 0x74, 0xcf, 0xd7, 0x0e, 0x89, 0xee, 0xfa, 0x3d, 0xa2, 0xaf,
+	0xd4, 0xf7, 0x72, 0x54, 0xf4, 0x41, 0x28, 0x49, 0xb1, 0x1c, 0xd7, 0xea, 0x6b, 0x73, 0x4b, 0x26,
+	0x57, 0xc0, 0xa2, 0xa2, 0x73, 0xff, 0x3d, 0x80, 0xdc, 0x50, 0x3f, 0x8e, 0x41, 0xa5, 0x96, 0x87,
+	0xca, 0x0e, 0xf5, 0xe3, 0x39, 0xd2, 0xa7, 0x70, 0xc1, 0xe1, 0xe1, 0x31, 0x87, 0xf3, 0x0a, 0xf2,
+	0x7b, 0xab, 0xe7, 0xa9, 0x60, 0xe2, 0xb0, 0xc8, 0x79, 0x77, 0xc1, 0x43, 0x3f, 0x87, 0x2c, 0xad,
+	0xa9, 0xb6, 0xcf, 0x72, 0xc6, 0x2b, 0x64, 0x18, 0xea, 0xfb, 0x4a, 0x5c, 0x38, 0x2e, 0x04, 0x22,
+	0x94, 0xe2, 0xa1, 0x32, 0xe4, 0x5e, 0xb8, 0x96, 0x4f, 0x34, 0xdf, 0x71, 0x34, 0x67, 0x60, 0x16,
+	0xb2, 0xac, 0xa6, 0x66, 0x18, 0x51, 0x75, 0x9c, 0xbd, 0x81, 0x89, 0x9e, 0x41, 0x21, 0xd6, 0x09,
+	0x87, 0x96, 0x1d, 0xb3, 0x4b, 0x7e, 0x79, 0xbb, 0xc4, 0x26, 0x8e, 0x8e, 0x65, 0xcf, 0x2d, 0xa4,
+	0xc2, 0x05, 0x97, 0x1c, 0xb8, 0xc4, 0x3b, 0x8c, 0x9b, 0xa8, 0xb0, 0xb1, 0x3c, 0x32, 0x8a, 0xe4,
+	0xe7, 0xa8, 0x3f, 0x85, 0x6b, 0x27, 0xa3, 0x41, 0x7b, 0xa1, 0x7b, 0x5a, 0x68, 0xc3, 0x82, 0xc2,
+	0x8e, 0x59, 0x38, 0xe1, 0xf5, 0x27, 0xba, 0x17, 0x1a, 0x1f, 0x7d, 0x0c, 0x8a, 0x65, 0x6b, 0x07,
+	0x03, 0x36, 0x02, 0x32, 0x63, 0x78, 0x85, 0x4d, 0x66, 0xdd, 0x6f, 0x2f, 0xb2, 0x2e, 0xf9, 0x6c,
+	0x4c, 0x6c, 0x83, 0x98, 0x4f, 0x28, 0x27, 0xdf, 0x55, 0xde, 0xb2, 0xef, 0x31, 0x79, 0x46, 0xf4,
+	0x4e, 0xdd, 0xaf, 0x44, 0x45, 0x6a, 0x4b, 0x72, 0x5a, 0x81, 0xb6, 0x24, 0xe7, 0x94, 0x7c, 0xf9,
+	0xef, 0x22, 0x6c, 0xc6, 0x32, 0x05, 0x13, 0xc3, 0x71, 0xcd, 0xaf, 0x30, 0x7b, 0xbf, 0x39, 0x99,
+	0x7a, 0xfe, 0xb0, 0xfd, 0x1a, 0xdc, 0x23, 0xc7, 0x5c, 0xb3, 0xae, 0x88, 0x91, 0x83, 0x92, 0x4a,
+	0xaa, 0x2d, 0xc9, 0x29, 0x45, 0x6e, 0x4b, 0xb2, 0xac, 0xa4, 0x23, 0x97, 0x81, 0x92, 0x69, 0x4b,
+	0x72, 0x56, 0xc9, 0x05, 0xee, 0x6b, 0x4b, 0x72, 0x5e, 0xd9, 0x68, 0x4b, 0xf2, 0x86, 0xa2, 0xb4,
+	0x25, 0x59, 0x51, 0x36, 0xcb, 0x7f, 0x13, 0x20, 0xd9, 0x62, 0x9b, 0x46, 0x3f, 0x02, 0x29, 0x9a,
+	0x58, 0xce, 0x38, 0x69, 0xcc, 0x65, 0x94, 0x1d, 0xd5, 0x40, 0xf4, 0x8f, 0xc3, 0xc9, 0x65, 0x15,
+	0xdf, 0x07, 0x47, 0xa4, 0xc2, 0x31, 0xb7, 0x8b, 0xab, 0xbb, 0x9d, 0x4f, 0x29, 0xbf, 0x13, 0x20,
+	0x7f, 0xd2, 0x88, 0x67, 0x5d, 0xcc, 0x0d, 0x90, 0x3d, 0xce, 0xcc, 0xef, 0xba, 0xf7, 0xdf, 0x4e,
+	0x4b, 0xf5, 0xa5, 0x6e, 0xd3, 0xef, 0xf9, 0x3a, 0x42, 0x0f, 0xd6, 0x25, 0x9f, 0xe1, 0x08, 0x38,
+	0xd6, 0xef, 0xfe, 0x27, 0x42, 0x62, 0x87, 0xe8, 0x1e, 0x41, 0x3f, 0x86, 0x44, 0x70, 0x79, 0x5a,
+	0x61, 0x22, 0x0b, 0x24, 0xd0, 0x33, 0x00, 0x72, 0x3c, 0xb2, 0x5c, 0x9d, 0xda, 0x60, 0xb9, 0x16,
+	0x5c, 0xfc, 0xef, 0xb4, 0x74, 0x35, 0x76, 0x92, 0xbb, 0x65, 0x57, 0xb7, 0x4d, 0x7b, 0x3c, 0x18,
+	0xe8, 0xbd, 0x01, 0x29, 0xe3, 0x18, 0x20, 0x6a, 0x40, 0x2a, 0xbc, 0x08, 0x89, 0x2b, 0x5f, 0x84,
+	0x42, 0x51, 0x34, 0x86, 0xd8, 0x35, 0x22, 0xb8, 0x27, 0xd2, 0x5f, 0xcf, 0x0a, 0xaf, 0xa6, 0xe7,
+	0xdc, 0xf1, 0xd6, 0x1c, 0x9d, 0x5d, 0x26, 0xbb, 0x0c, 0x1b, 0xed, 0x42, 0x66, 0xe4, 0x3a, 0x23,
+	0xc7, 0xa3, 0xf5, 0xd9, 0x5b, 0x2e, 0xef, 0xf3, 0xb3, 0x69, 0x09, 0x1e, 0x71, 0x29, 0xb5, 0x8b,
+	0x21, 0x44, 0x50, 0x3d, 0x74, 0x11, 0x12, 0x64, 0xe4, 0x18, 0x87, 0xac, 0x3f, 0x8b, 0x38, 0x78,
+	0x41, 0x1f, 0xc6, 0xa2, 0x86, 0x76, 0x5b, 0xb1, 0xb6, 0xf9, 0x76, 0x5a, 0xca, 0x31, 0xcf, 0x86,
+	0xb1, 0x17, 0xf7, 0x7f, 0x58, 0x4d, 0xcb, 0x33, 0x01, 0xf2, 0xd5, 0x9e, 0xe3, 0xb2, 0xd2, 0xd0,
+	0xb4, 0x7d, 0x77, 0x72, 0x56, 0x70, 0x9e, 0x7f, 0xd4, 0x42, 0x87, 0x20, 0x8f, 0x5c, 0xcb, 0x71,
+	0x2d, 0x7f, 0xc2, 0xbf, 0xcd, 0xec, 0xbc, 0x9d, 0x96, 0x1e, 0x9c, 0x37, 0xbe, 0x1f, 0x71, 0x4c,
+	0x1c, 0xa1, 0xc7, 0x83, 0x7c, 0x1d, 0xb2, 0xea, 0xb1, 0x5d, 0x77, 0x1c, 0xd7, 0xa4, 0x19, 0x8e,
+	0x3e, 0x0a, 0x4a, 0x43, 0x10, 0xe9, 0xc5, 0xb3, 0x73, 0x3a, 0x5e, 0x0e, 0x6e, 0x40, 0xce, 0x70,
+	0x86, 0x43, 0xdd, 0x36, 0x35, 0xc3, 0x19, 0xdb, 0x7e, 0x70, 0x02, 0x9c, 0xe5, 0xc4, 0x3a, 0xa5,
+	0xa1, 0x1a, 0xe4, 0x78, 0x4b, 0xd5, 0x5c, 0xa2, 0x9b, 0x34, 0xbc, 0x96, 0xa8, 0xd0, 0x59, 0x2e,
+	0x83, 0xa9, 0x08, 0x6a, 0x40, 0x3e, 0xc4, 0xe0, 0x05, 0x3a, 0xb1, 0x0c, 0x48, 0xa8, 0x38, 0xa8,
+	0xca, 0xe8, 0x7b, 0xb0, 0x11, 0xa2, 0x58, 0xf6, 0x91, 0x3e, 0xb0, 0x4c, 0x16, 0x1c, 0x32, 0x0e,
+	0xc1, 0x5b, 0x01, 0x75, 0x61, 0x47, 0x90, 0xcf, 0xd5, 0x11, 0xa2, 0x3e, 0x90, 0x54, 0x52, 0xb7,
+	0xfe, 0x2c, 0x40, 0x9a, 0x7d, 0x4d, 0x64, 0x9f, 0x38, 0x32, 0x90, 0xda, 0xdf, 0x7d, 0xb8, 0xbb,
+	0xf7, 0x64, 0x57, 0x59, 0x43, 0x29, 0x10, 0x5b, 0xbb, 0xaa, 0x22, 0xa0, 0x34, 0x24, 0xee, 0xed,
+	0xec, 0x55, 0x55, 0x65, 0x9d, 0x3e, 0xd6, 0x9e, 0xaa, 0xcd, 0xae, 0x22, 0xa2, 0x0b, 0xb0, 0xd1,
+	0x68, 0xee, 0xb4, 0x3a, 0x2d, 0xb5, 0xd9, 0xd0, 0x02, 0xa2, 0x8c, 0x64, 0x90, 0xd4, 0x56, 0xa7,
+	0xa9, 0x48, 0x14, 0xaa, 0xd1, 0xac, 0xb7, 0x3a, 0xd5, 0x1d, 0x25, 0x81, 0xb6, 0x60, 0x73, 0xce,
+	0x1b, 0x92, 0xd3, 0x28, 0x0b, 0x72, 0x63, 0x1f, 0x57, 0xd5, 0xd6, 0xde, 0xae, 0x92, 0xa4, 0xd8,
+	0xea, 0xfe, 0xa3, 0x9d, 0xa6, 0x02, 0x74, 0xa1, 0xd6, 0x52, 0xab, 0x18, 0x57, 0x9f, 0x2a, 0x19,
+	0x94, 0x07, 0xa0, 0xa0, 0xdd, 0x26, 0x6e, 0x35, 0xbb, 0x8a, 0x59, 0xa6, 0x5d, 0x2b, 0x75, 0xeb,
+	0x67, 0xb0, 0x79, 0xea, 0xcb, 0x0d, 0xda, 0x80, 0x4c, 0xb5, 0xd1, 0xd0, 0x70, 0xf3, 0xd1, 0x4e,
+	0xab, 0x5e, 0x55, 0xd6, 0x10, 0x82, 0x3c, 0x6e, 0x76, 0xf6, 0x1e, 0x37, 0x23, 0x9a, 0x70, 0x55,
+	0xfa, 0xfc, 0xf7, 0xc5, 0xb5, 0x5b, 0x7b, 0x27, 0xa6, 0x92, 0xa0, 0x3d, 0xd0, 0x5d, 0x3f, 0x6a,
+	0xee, 0x36, 0x5a, 0xbb, 0xf7, 0x95, 0x35, 0xfa, 0xd2, 0x55, 0xab, 0xf7, 0xe9, 0x8b, 0x88, 0x72,
+	0x90, 0xae, 0xef, 0x75, 0x3a, 0x2d, 0x55, 0x6d, 0x36, 0x14, 0x81, 0xae, 0x55, 0x6b, 0x7b, 0x98,
+	0xbe, 0xac, 0x07, 0x80, 0xb5, 0xef, 0xbf, 0xfa, 0x77, 0x71, 0xed, 0xd5, 0xac, 0x28, 0xbc, 0x9e,
+	0x15, 0x85, 0x2f, 0x67, 0x45, 0xe1, 0x5f, 0xb3, 0xa2, 0xf0, 0xc5, 0x9b, 0xe2, 0xda, 0xeb, 0x37,
+	0xc5, 0xb5, 0x2f, 0xdf, 0x14, 0xd7, 0x3e, 0x49, 0x71, 0x37, 0xf5, 0x92, 0xec, 0xf3, 0xf6, 0x9d,
+	0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xba, 0x56, 0x1f, 0x98, 0x17, 0x00, 0x00,
 }
diff --git a/pkg/roachpb/data.proto b/pkg/roachpb/data.proto
index 75dbfae51eb7..e20947a797be 100644
--- a/pkg/roachpb/data.proto
+++ b/pkg/roachpb/data.proto
@@ -162,9 +162,16 @@ message ChangeReplicasTrigger {
 
   option (gogoproto.goproto_stringer) = false;
 
-  ReplicaChangeType change_type = 1;
+  // TODO(tbg): remove once we know that no trigger using this will ever be
+  // applied (this will require something like #39182).
+  //
+  // TODO(tbg): when removing this, also rename internal_x_replicas to just
+  // x_replicas and remove the getter.
+  ReplicaChangeType deprecated_change_type = 1;
   // The replica being modified.
-  ReplicaDescriptor replica = 2 [(gogoproto.nullable) = false];
+  // TODO(tbg): remove once we know that no trigger using this will ever be
+  // applied (this will require something like #39182).
+  ReplicaDescriptor deprecated_replica = 2 [(gogoproto.nullable) = false];
   // The new replica list with this change applied.
   repeated ReplicaDescriptor deprecated_updated_replicas = 3 [(gogoproto.nullable) = false];
   // The next replica id to use with this change applied.
@@ -175,6 +182,14 @@ message ChangeReplicasTrigger {
   // TODO(jeffreyxiao): Remove deprecated_updated_replicas and
   // deprecated_next_replica_id in 20.1.
   RangeDescriptor desc = 5;
+  // The new replicas added in this change (all reflected in desc, which is necessarily
+  // set when this field is used). Must not specify the same replica more than once or
+  // overlap with the removed replicas below.
+  repeated ReplicaDescriptor internal_added_replicas = 6 [(gogoproto.nullable) = false];
+  // The replicas removed in this change (all reflected in desc, which is necessarily
+  // set when this field is used). Must not specify the same replica more than once or
+  // overlap with the added replicas above.
+  repeated ReplicaDescriptor internal_removed_replicas = 7 [(gogoproto.nullable) = false];
 }
 
 // ModifiedSpanTrigger indicates that a specific span has been modified.
diff --git a/pkg/roachpb/data_test.go b/pkg/roachpb/data_test.go
index 2fc59f7b89c4..d9de20337186 100644
--- a/pkg/roachpb/data_test.go
+++ b/pkg/roachpb/data_test.go
@@ -1568,17 +1568,18 @@ func TestChangeReplicasTrigger_String(t *testing.T) {
 
 	l := ReplicaType_LEARNER
 	v := ReplicaType_VOTER
-	repl := ReplicaDescriptor{NodeID: 1, StoreID: 2, ReplicaID: 3, Type: &l}
+	repl1 := ReplicaDescriptor{NodeID: 1, StoreID: 2, ReplicaID: 3, Type: &l}
+	repl2 := ReplicaDescriptor{NodeID: 4, StoreID: 5, ReplicaID: 6, Type: &v}
 	crt := ChangeReplicasTrigger{
-		ChangeType: ADD_REPLICA,
-		Replica:    repl,
+		InternalAddedReplicas:   []ReplicaDescriptor{repl1},
+		InternalRemovedReplicas: []ReplicaDescriptor{repl2},
 		Desc: &RangeDescriptor{
 			RangeID:  1,
 			StartKey: RKey("a"),
 			EndKey:   RKey("b"),
 			InternalReplicas: []ReplicaDescriptor{
-				repl,
-				{NodeID: 4, StoreID: 5, ReplicaID: 6, Type: &v},
+				repl1,
+				repl2,
 				{NodeID: 7, StoreID: 8, ReplicaID: 9, Type: &l},
 			},
 			NextReplicaID:        10,
@@ -1587,6 +1588,6 @@ func TestChangeReplicasTrigger_String(t *testing.T) {
 		},
 	}
 	act := crt.String()
-	exp := `ADD_REPLICA((n1,s2):3LEARNER): updated=(n4,s5):6,(n1,s2):3LEARNER,(n7,s8):9LEARNER next=10`
+	exp := "ADD_REPLICA[(n1,s2):3LEARNER], REMOVE_REPLICA[(n4,s5):6]: after=[(n1,s2):3LEARNER (n4,s5):6 (n7,s8):9LEARNER] next=10"
 	require.Equal(t, exp, act)
 }
diff --git a/pkg/settings/cluster/cockroach_versions.go b/pkg/settings/cluster/cockroach_versions.go
index b70d1a88f964..879894c8764e 100644
--- a/pkg/settings/cluster/cockroach_versions.go
+++ b/pkg/settings/cluster/cockroach_versions.go
@@ -42,6 +42,7 @@ const (
 	VersionGenerationComparable
 	VersionLearnerReplicas
 	VersionTopLevelForeignKeys
+	VersionAtomicChangeReplicasTrigger
 
 	// Add new versions here (step one of two).
 
@@ -504,6 +505,14 @@ var versionsSingleton = keyedVersions([]keyedVersion{
 		Key:     VersionTopLevelForeignKeys,
 		Version: roachpb.Version{Major: 19, Minor: 1, Unstable: 7},
 	},
+	{
+		// VersionAtomicChangeReplicasTrigger is https://github.com/cockroachdb/cockroach/pull/39485.
+		//
+		// It enables use of updated fields in ChangeReplicasTrigger that will
+		// support atomic replication changes.
+		Key:     VersionAtomicChangeReplicasTrigger,
+		Version: roachpb.Version{Major: 19, Minor: 1, Unstable: 8},
+	},
 
 	// Add new versions here (step two of two).
 
diff --git a/pkg/settings/cluster/versionkey_string.go b/pkg/settings/cluster/versionkey_string.go
index 40c87bf13f70..15cb3fa0899f 100644
--- a/pkg/settings/cluster/versionkey_string.go
+++ b/pkg/settings/cluster/versionkey_string.go
@@ -19,11 +19,12 @@ func _() {
 	_ = x[VersionGenerationComparable-8]
 	_ = x[VersionLearnerReplicas-9]
 	_ = x[VersionTopLevelForeignKeys-10]
+	_ = x[VersionAtomicChangeReplicasTrigger-11]
 }
 
-const _VersionKey_name = "Version2_1VersionUnreplicatedRaftTruncatedStateVersionSideloadedStorageNoReplicaIDVersion19_1VersionStart19_2VersionQueryTxnTimestampVersionStickyBitVersionParallelCommitsVersionGenerationComparableVersionLearnerReplicasVersionTopLevelForeignKeys"
+const _VersionKey_name = "Version2_1VersionUnreplicatedRaftTruncatedStateVersionSideloadedStorageNoReplicaIDVersion19_1VersionStart19_2VersionQueryTxnTimestampVersionStickyBitVersionParallelCommitsVersionGenerationComparableVersionLearnerReplicasVersionTopLevelForeignKeysVersionAtomicChangeReplicasTrigger"
 
-var _VersionKey_index = [...]uint8{0, 10, 47, 82, 93, 109, 133, 149, 171, 198, 220, 246}
+var _VersionKey_index = [...]uint16{0, 10, 47, 82, 93, 109, 133, 149, 171, 198, 220, 246, 280}
 
 func (i VersionKey) String() string {
 	if i < 0 || i >= VersionKey(len(_VersionKey_index)-1) {
diff --git a/pkg/storage/batcheval/cmd_end_transaction.go b/pkg/storage/batcheval/cmd_end_transaction.go
index d30569ded31e..5ab16a2412e3 100644
--- a/pkg/storage/batcheval/cmd_end_transaction.go
+++ b/pkg/storage/batcheval/cmd_end_transaction.go
@@ -591,6 +591,10 @@ func RunCommitTrigger(
 		return trigger, err
 	}
 	if crt := ct.GetChangeReplicasTrigger(); crt != nil {
+		// TODO(tbg): once we support atomic replication changes, check that
+		// crt.Added() and crt.Removed() don't intersect (including mentioning
+		// the same replica more than once individually) because it would be
+		// silly (though possible) to have to attach semantics to that.
 		return changeReplicasTrigger(ctx, rec, batch, crt), nil
 	}
 	if ct.GetModifiedSpanTrigger() != nil {
diff --git a/pkg/storage/client_replica_gc_test.go b/pkg/storage/client_replica_gc_test.go
index 7130a47a6b86..7b8e41cf1b36 100644
--- a/pkg/storage/client_replica_gc_test.go
+++ b/pkg/storage/client_replica_gc_test.go
@@ -70,7 +70,7 @@ func TestReplicaGCQueueDropReplicaDirect(t *testing.T) {
 				return nil
 			}
 			crt := et.InternalCommitTrigger.GetChangeReplicasTrigger()
-			if crt == nil || crt.ChangeType != roachpb.REMOVE_REPLICA {
+			if crt == nil || crt.DeprecatedChangeType != roachpb.REMOVE_REPLICA {
 				return nil
 			}
 			testutils.SucceedsSoon(t, func() error {
diff --git a/pkg/storage/raft.pb.go b/pkg/storage/raft.pb.go
index c5e8837a231c..97b93abcba9a 100644
--- a/pkg/storage/raft.pb.go
+++ b/pkg/storage/raft.pb.go
@@ -70,7 +70,7 @@ func (x *SnapshotRequest_Priority) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (SnapshotRequest_Priority) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{5, 0}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{5, 0}
 }
 
 type SnapshotRequest_Strategy int32
@@ -107,7 +107,7 @@ func (x *SnapshotRequest_Strategy) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (SnapshotRequest_Strategy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{5, 1}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{5, 1}
 }
 
 type SnapshotRequest_Type int32
@@ -146,7 +146,7 @@ func (x *SnapshotRequest_Type) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (SnapshotRequest_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{5, 2}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{5, 2}
 }
 
 type SnapshotResponse_Status int32
@@ -191,7 +191,7 @@ func (x *SnapshotResponse_Status) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (SnapshotResponse_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{6, 0}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{6, 0}
 }
 
 // RaftHeartbeat is a request that contains the barebones information for a
@@ -211,7 +211,7 @@ func (m *RaftHeartbeat) Reset()         { *m = RaftHeartbeat{} }
 func (m *RaftHeartbeat) String() string { return proto.CompactTextString(m) }
 func (*RaftHeartbeat) ProtoMessage()    {}
 func (*RaftHeartbeat) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{0}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{0}
 }
 func (m *RaftHeartbeat) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -267,7 +267,7 @@ func (m *RaftMessageRequest) Reset()         { *m = RaftMessageRequest{} }
 func (m *RaftMessageRequest) String() string { return proto.CompactTextString(m) }
 func (*RaftMessageRequest) ProtoMessage()    {}
 func (*RaftMessageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{1}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{1}
 }
 func (m *RaftMessageRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -300,7 +300,7 @@ func (m *RaftMessageRequestBatch) Reset()         { *m = RaftMessageRequestBatch
 func (m *RaftMessageRequestBatch) String() string { return proto.CompactTextString(m) }
 func (*RaftMessageRequestBatch) ProtoMessage()    {}
 func (*RaftMessageRequestBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{2}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{2}
 }
 func (m *RaftMessageRequestBatch) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -333,7 +333,7 @@ func (m *RaftMessageResponseUnion) Reset()         { *m = RaftMessageResponseUni
 func (m *RaftMessageResponseUnion) String() string { return proto.CompactTextString(m) }
 func (*RaftMessageResponseUnion) ProtoMessage()    {}
 func (*RaftMessageResponseUnion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{3}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{3}
 }
 func (m *RaftMessageResponseUnion) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -376,7 +376,7 @@ func (m *RaftMessageResponse) Reset()         { *m = RaftMessageResponse{} }
 func (m *RaftMessageResponse) String() string { return proto.CompactTextString(m) }
 func (*RaftMessageResponse) ProtoMessage()    {}
 func (*RaftMessageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{4}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{4}
 }
 func (m *RaftMessageResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -417,7 +417,7 @@ func (m *SnapshotRequest) Reset()         { *m = SnapshotRequest{} }
 func (m *SnapshotRequest) String() string { return proto.CompactTextString(m) }
 func (*SnapshotRequest) ProtoMessage()    {}
 func (*SnapshotRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{5}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{5}
 }
 func (m *SnapshotRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -479,7 +479,7 @@ func (m *SnapshotRequest_Header) Reset()         { *m = SnapshotRequest_Header{}
 func (m *SnapshotRequest_Header) String() string { return proto.CompactTextString(m) }
 func (*SnapshotRequest_Header) ProtoMessage()    {}
 func (*SnapshotRequest_Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{5, 0}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{5, 0}
 }
 func (m *SnapshotRequest_Header) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -513,7 +513,7 @@ func (m *SnapshotResponse) Reset()         { *m = SnapshotResponse{} }
 func (m *SnapshotResponse) String() string { return proto.CompactTextString(m) }
 func (*SnapshotResponse) ProtoMessage()    {}
 func (*SnapshotResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{6}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{6}
 }
 func (m *SnapshotResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -544,15 +544,13 @@ type ConfChangeContext struct {
 	// Payload is the application-level command (i.e. an encoded
 	// storagepb.RaftCommand).
 	Payload []byte `protobuf:"bytes,2,opt,name=payload" json:"payload,omitempty"`
-	// Replica contains full details about the replica being added or removed.
-	Replica roachpb.ReplicaDescriptor `protobuf:"bytes,3,opt,name=replica" json:"replica"`
 }
 
 func (m *ConfChangeContext) Reset()         { *m = ConfChangeContext{} }
 func (m *ConfChangeContext) String() string { return proto.CompactTextString(m) }
 func (*ConfChangeContext) ProtoMessage()    {}
 func (*ConfChangeContext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_raft_11bfea08aab81984, []int{7}
+	return fileDescriptor_raft_d6a64da2f1251cf6, []int{7}
 }
 func (m *ConfChangeContext) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1151,14 +1149,6 @@ func (m *ConfChangeContext) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintRaft(dAtA, i, uint64(len(m.Payload)))
 		i += copy(dAtA[i:], m.Payload)
 	}
-	dAtA[i] = 0x1a
-	i++
-	i = encodeVarintRaft(dAtA, i, uint64(m.Replica.Size()))
-	n11, err := m.Replica.MarshalTo(dAtA[i:])
-	if err != nil {
-		return 0, err
-	}
-	i += n11
 	return i, nil
 }
 
@@ -1330,8 +1320,6 @@ func (m *ConfChangeContext) Size() (n int) {
 		l = len(m.Payload)
 		n += 1 + l + sovRaft(uint64(l))
 	}
-	l = m.Replica.Size()
-	n += 1 + l + sovRaft(uint64(l))
 	return n
 }
 
@@ -2700,36 +2688,6 @@ func (m *ConfChangeContext) Unmarshal(dAtA []byte) error {
 				m.Payload = []byte{}
 			}
 			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Replica", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowRaft
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthRaft
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.Replica.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRaft(dAtA[iNdEx:])
@@ -2856,86 +2814,85 @@ var (
 	ErrIntOverflowRaft   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("storage/raft.proto", fileDescriptor_raft_11bfea08aab81984) }
-
-var fileDescriptor_raft_11bfea08aab81984 = []byte{
-	// 1234 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0xcd, 0x6e, 0x1b, 0x55,
-	0x14, 0xf6, 0xc4, 0x63, 0x7b, 0x7c, 0x6c, 0x27, 0xd3, 0x4b, 0x05, 0x23, 0x53, 0x1c, 0x6b, 0x4a,
-	0x8b, 0x5b, 0x84, 0x5d, 0xa2, 0xc2, 0x82, 0x9d, 0x7f, 0x26, 0x8d, 0x9b, 0x3f, 0x6b, 0xe2, 0x06,
-	0x81, 0x54, 0x59, 0xe3, 0xf1, 0x8d, 0x3d, 0x8a, 0x3d, 0x33, 0x9d, 0xb9, 0x2e, 0xb8, 0x4f, 0xc1,
-	0x23, 0xb0, 0x61, 0xc1, 0x13, 0xf0, 0x0a, 0xd9, 0x20, 0x75, 0x59, 0x09, 0x14, 0x41, 0xca, 0x53,
-	0x74, 0x85, 0xee, 0x9f, 0xe3, 0xfc, 0x40, 0x13, 0x84, 0xd8, 0xb0, 0xb1, 0x67, 0xce, 0x39, 0xdf,
-	0x77, 0xe6, 0xfc, 0xde, 0x0b, 0x28, 0x26, 0x41, 0xe4, 0x0c, 0x71, 0x2d, 0x72, 0x0e, 0x48, 0x35,
-	0x8c, 0x02, 0x12, 0xa0, 0x1b, 0x6e, 0xe0, 0x1e, 0x46, 0x81, 0xe3, 0x8e, 0xaa, 0x42, 0x5b, 0xbc,
-	0xc9, 0x5e, 0xc3, 0x7e, 0x0d, 0x47, 0x51, 0x10, 0xc5, 0xdc, 0xb0, 0xf8, 0xae, 0x94, 0x4e, 0x30,
-	0x71, 0x06, 0x0e, 0x71, 0x84, 0xfc, 0x03, 0x49, 0x2a, 0xfe, 0xc3, 0x7e, 0x2d, 0x26, 0x0e, 0xc1,
-	0x42, 0xfd, 0x3e, 0x26, 0xee, 0x80, 0x39, 0x64, 0x3f, 0x61, 0x7f, 0xc1, 0x79, 0xf1, 0xe6, 0x30,
-	0x18, 0x06, 0xec, 0xb1, 0x46, 0x9f, 0xb8, 0xd4, 0xfc, 0x29, 0x09, 0x05, 0xdb, 0x39, 0x20, 0x1b,
-	0xd8, 0x89, 0x48, 0x1f, 0x3b, 0x04, 0xf5, 0x41, 0x8b, 0x1c, 0x7f, 0x88, 0x7b, 0xde, 0xc0, 0x50,
-	0xca, 0x4a, 0x45, 0x6d, 0x3c, 0x3a, 0x3a, 0x5e, 0x4d, 0x9c, 0x1c, 0xaf, 0x66, 0x6c, 0x2a, 0x6f,
-	0xb7, 0xde, 0x1c, 0xaf, 0x3e, 0x1c, 0x7a, 0x64, 0x34, 0xed, 0x57, 0xdd, 0x60, 0x52, 0x9b, 0x07,
-	0x35, 0xe8, 0x9f, 0x3e, 0xd7, 0xc2, 0xc3, 0x61, 0x4d, 0x44, 0x51, 0x15, 0x38, 0x3b, 0xc3, 0x88,
-	0xdb, 0x03, 0xf4, 0x0d, 0xac, 0x1c, 0x44, 0xc1, 0xa4, 0x17, 0xe1, 0x70, 0xec, 0xb9, 0x0e, 0x75,
-	0xb5, 0x54, 0x56, 0x2a, 0x85, 0xc6, 0xae, 0x70, 0x55, 0x58, 0x8f, 0x82, 0x89, 0xcd, 0xb5, 0xcc,
-	0xe1, 0xe7, 0xd7, 0x73, 0x28, 0x91, 0x76, 0xe1, 0x60, 0x81, 0x68, 0x80, 0x9e, 0x41, 0x81, 0x04,
-	0x8b, 0x6e, 0x93, 0xcc, 0xed, 0xb6, 0x70, 0x9b, 0xeb, 0x06, 0xff, 0x86, 0xd3, 0x1c, 0x09, 0x4e,
-	0x5d, 0x1a, 0xa0, 0x12, 0x1c, 0x4d, 0x0c, 0x95, 0xe5, 0x52, 0xa5, 0x9e, 0x6c, 0x26, 0x41, 0xb7,
-	0x20, 0xed, 0x06, 0x93, 0x89, 0x47, 0x8c, 0xd4, 0x82, 0x4e, 0xc8, 0x50, 0x09, 0x32, 0xcf, 0xa6,
-	0x1e, 0x8e, 0x5d, 0x6c, 0xa4, 0xcb, 0x4a, 0x45, 0x13, 0x6a, 0x29, 0x34, 0x7f, 0x51, 0x01, 0xd1,
-	0xca, 0x6d, 0xe3, 0x38, 0x76, 0x86, 0xd8, 0xc6, 0xcf, 0xa6, 0x38, 0xfe, 0x6f, 0xca, 0xb7, 0x0d,
-	0xf9, 0xc5, 0xf2, 0xb1, 0xda, 0xe5, 0xd6, 0x3e, 0xac, 0x9e, 0xb6, 0xf7, 0xb9, 0x9c, 0xb4, 0x70,
-	0xec, 0x46, 0x5e, 0x48, 0x82, 0x48, 0x44, 0x91, 0x5b, 0x28, 0x0b, 0x6a, 0x03, 0x9c, 0x16, 0x85,
-	0x55, 0xe4, 0x7a, 0x64, 0xd9, 0x79, 0xba, 0x51, 0x0d, 0x32, 0x13, 0x9e, 0x0f, 0x96, 0xef, 0xdc,
-	0xda, 0x4a, 0x95, 0x4f, 0x42, 0x55, 0xa4, 0x49, 0x66, 0x51, 0x58, 0x2d, 0x66, 0x39, 0x75, 0x49,
-	0x96, 0xd1, 0x3a, 0xc0, 0x48, 0x8e, 0x46, 0x6c, 0xa4, 0xcb, 0xc9, 0x4a, 0x6e, 0xad, 0x5c, 0xbd,
-	0x30, 0xc7, 0xd5, 0x33, 0x33, 0x24, 0x48, 0x16, 0x90, 0x68, 0x17, 0x56, 0xe6, 0x6f, 0xbd, 0x08,
-	0xc7, 0x61, 0x6c, 0x64, 0xae, 0x45, 0xb6, 0x3c, 0x87, 0xdb, 0x14, 0x8d, 0x9e, 0xc2, 0x0a, 0xaf,
-	0x73, 0x4c, 0x9c, 0x88, 0xf4, 0x0e, 0xf1, 0xcc, 0xd0, 0xca, 0x4a, 0x25, 0xdf, 0xf8, 0xec, 0xcd,
-	0xf1, 0xea, 0xa7, 0xd7, 0xab, 0xef, 0x26, 0x9e, 0xd9, 0x05, 0xc6, 0xb6, 0x47, 0xc9, 0x36, 0xf1,
-	0xcc, 0xec, 0xc3, 0x7b, 0x17, 0x9b, 0xab, 0xe1, 0x10, 0x77, 0x84, 0x1e, 0x81, 0x16, 0xf1, 0xf7,
-	0xd8, 0x50, 0x58, 0x0c, 0x77, 0xfe, 0x22, 0x86, 0x73, 0x68, 0x1e, 0xc8, 0x1c, 0x6c, 0x76, 0xc0,
-	0x38, 0x63, 0x15, 0x87, 0x81, 0x1f, 0xe3, 0x27, 0xbe, 0x17, 0xf8, 0xa8, 0x0a, 0x29, 0xb6, 0x11,
-	0x59, 0x0f, 0xe7, 0xd6, 0x8c, 0x4b, 0xda, 0xc1, 0xa2, 0x7a, 0x9b, 0x9b, 0x7d, 0xa1, 0x1e, 0x7d,
-	0xbf, 0xaa, 0x98, 0xbf, 0x2e, 0xc1, 0x3b, 0x97, 0x50, 0xfe, 0xcf, 0x87, 0xe2, 0x11, 0xa4, 0xa6,
-	0x34, 0xa9, 0x62, 0x24, 0x3e, 0x7e, 0x5b, 0xb5, 0x16, 0xea, 0x20, 0xc8, 0x38, 0xde, 0xfc, 0x23,
-	0x0d, 0x2b, 0x7b, 0xbe, 0x13, 0xc6, 0xa3, 0x80, 0xc8, 0x7d, 0x53, 0x87, 0xf4, 0x08, 0x3b, 0x03,
-	0x2c, 0x2b, 0x75, 0xef, 0x12, 0xf6, 0x73, 0x98, 0xea, 0x06, 0x03, 0xd8, 0x02, 0x88, 0xee, 0x82,
-	0x76, 0xf8, 0xbc, 0xd7, 0xa7, 0xcd, 0xc5, 0xb2, 0x96, 0x6f, 0xe4, 0x68, 0x65, 0x36, 0xf7, 0x59,
-	0xbf, 0xd9, 0x99, 0xc3, 0xe7, 0xbc, 0xf1, 0x56, 0x21, 0x37, 0x0e, 0x86, 0x3d, 0xec, 0x93, 0xc8,
-	0xc3, 0xb1, 0x91, 0x2c, 0x27, 0x2b, 0x79, 0x1b, 0xc6, 0xc1, 0xd0, 0xe2, 0x12, 0x54, 0x84, 0xd4,
-	0x81, 0xe7, 0x3b, 0x63, 0x16, 0xa8, 0x1c, 0x65, 0x2e, 0x2a, 0xfe, 0xa8, 0x42, 0x9a, 0xfb, 0x45,
-	0x4f, 0xe1, 0x26, 0x5d, 0x0a, 0x3d, 0xb1, 0x03, 0x7a, 0xa2, 0x21, 0x45, 0xc5, 0xae, 0xd5, 0xcc,
-	0x28, 0xba, 0xb8, 0x81, 0x6f, 0x03, 0x88, 0xc9, 0xf4, 0x5e, 0x60, 0x56, 0xb9, 0xa4, 0xac, 0x09,
-	0x9f, 0x31, 0xef, 0x05, 0x46, 0x77, 0x20, 0xe7, 0x3a, 0x7e, 0x6f, 0x80, 0xdd, 0xb1, 0xe7, 0xe3,
-	0x33, 0x1f, 0x0c, 0xae, 0xe3, 0xb7, 0xb8, 0x1c, 0x59, 0x90, 0x62, 0x07, 0x3c, 0x5b, 0x4e, 0x97,
-	0x27, 0x77, 0x7e, 0x15, 0x90, 0xad, 0xb0, 0x47, 0x01, 0x32, 0x78, 0x86, 0x46, 0xdb, 0xa0, 0x85,
-	0x91, 0x17, 0x44, 0x1e, 0x99, 0xb1, 0xc3, 0x64, 0xf9, 0xd2, 0x26, 0x38, 0x5f, 0xa6, 0x8e, 0x80,
-	0xc8, 0xc1, 0x95, 0x14, 0x94, 0x2e, 0x26, 0x91, 0x43, 0xf0, 0x70, 0x66, 0x64, 0xae, 0x4c, 0xb7,
-	0x27, 0x20, 0x92, 0x4e, 0x52, 0xa0, 0x75, 0xb8, 0x35, 0xf5, 0x45, 0xa7, 0x13, 0x3c, 0xe8, 0x91,
-	0x68, 0xea, 0xf3, 0x27, 0x1e, 0xbb, 0xb6, 0x90, 0x9c, 0xe2, 0xa2, 0x65, 0x57, 0x1a, 0xb2, 0x90,
-	0x51, 0x1d, 0x54, 0x32, 0x0b, 0xb1, 0x91, 0x65, 0x9f, 0xf4, 0xd1, 0x15, 0x3e, 0xa9, 0x3b, 0x0b,
-	0xf1, 0xfc, 0x48, 0x9e, 0x85, 0xf8, 0xb1, 0xaa, 0x29, 0xfa, 0x92, 0xf9, 0x10, 0x34, 0x19, 0x3b,
-	0xca, 0x41, 0xe6, 0xc9, 0xce, 0xe6, 0xce, 0xee, 0x97, 0x3b, 0x7a, 0x02, 0xe5, 0x41, 0xb3, 0xad,
-	0xe6, 0xee, 0xbe, 0x65, 0x7f, 0xa5, 0x2b, 0xa8, 0x00, 0x59, 0xdb, 0x6a, 0xd4, 0xb7, 0xea, 0x3b,
-	0x4d, 0x4b, 0x5f, 0x32, 0x0d, 0xd0, 0x64, 0x88, 0xd4, 0x70, 0x73, 0xbf, 0xd7, 0xa8, 0x77, 0x9b,
-	0x1b, 0x7a, 0xc2, 0xfc, 0x04, 0x54, 0xea, 0x09, 0x69, 0xa0, 0xda, 0xf5, 0xf5, 0xae, 0x9e, 0xa0,
-	0xac, 0x5b, 0x56, 0xdd, 0xde, 0xb1, 0x6c, 0x5d, 0x41, 0xcb, 0x00, 0x1d, 0xdb, 0xb2, 0xb6, 0x3b,
-	0xdd, 0xf6, 0x3e, 0x25, 0xfa, 0x59, 0x01, 0xfd, 0xf4, 0x4b, 0xc5, 0x0a, 0xdb, 0x80, 0x34, 0xcd,
-	0xc6, 0x34, 0x66, 0x73, 0xb6, 0xbc, 0x76, 0xff, 0x6f, 0xc3, 0xe3, 0xa0, 0xea, 0x1e, 0x43, 0xc8,
-	0x8b, 0x05, 0xc7, 0xd3, 0x23, 0x4f, 0x9e, 0x91, 0xb4, 0xe3, 0xb3, 0xe7, 0x8e, 0x44, 0xb3, 0x0d,
-	0x69, 0x8e, 0xbb, 0x10, 0x7b, 0xbd, 0xd9, 0xb4, 0x3a, 0x5d, 0xab, 0xa5, 0x2b, 0x54, 0x55, 0xef,
-	0x74, 0xb6, 0xda, 0x56, 0x4b, 0x5f, 0x42, 0x59, 0x48, 0x59, 0xb6, 0xbd, 0x6b, 0xeb, 0x49, 0x6a,
-	0xd5, 0xb2, 0x9a, 0x5b, 0xed, 0x1d, 0xab, 0xa5, 0xab, 0x8f, 0x55, 0x2d, 0xa9, 0xab, 0xe6, 0x0f,
-	0x0a, 0xdc, 0x68, 0x06, 0xfe, 0x41, 0x73, 0x44, 0xdb, 0xbf, 0x19, 0xf8, 0x04, 0x7f, 0x4b, 0xd0,
-	0x03, 0x00, 0x7a, 0xd3, 0x71, 0xfc, 0x81, 0xdc, 0xca, 0xd9, 0xc6, 0x0d, 0xb1, 0x95, 0xb3, 0x4d,
-	0xae, 0x69, 0xb7, 0xec, 0xac, 0x30, 0x62, 0x37, 0xa9, 0x4c, 0xe8, 0xcc, 0xc6, 0x81, 0xc3, 0x6f,
-	0x8b, 0x79, 0x5b, 0xbe, 0xa2, 0x16, 0x64, 0xfe, 0xf9, 0xa6, 0x94, 0xd0, 0xb5, 0x57, 0x0a, 0x64,
-	0xb7, 0xa7, 0x63, 0xe2, 0xd1, 0x71, 0x47, 0x63, 0xd0, 0x17, 0xc6, 0x9e, 0x6f, 0xa0, 0xfb, 0x57,
-	0xdb, 0x0d, 0xd4, 0xb6, 0x78, 0xf7, 0x6a, 0x6b, 0xd6, 0x4c, 0x54, 0x94, 0x07, 0x0a, 0x7a, 0x0a,
-	0x79, 0xaa, 0x94, 0x15, 0x44, 0xe6, 0xdb, 0xbb, 0xb7, 0x78, 0xfb, 0x0a, 0x2d, 0xc0, 0xe9, 0x1b,
-	0xf7, 0x8e, 0x7e, 0x2f, 0x25, 0x8e, 0x4e, 0x4a, 0xca, 0xcb, 0x93, 0x92, 0xf2, 0xea, 0xa4, 0xa4,
-	0xfc, 0x76, 0x52, 0x52, 0xbe, 0x7b, 0x5d, 0x4a, 0xbc, 0x7c, 0x5d, 0x4a, 0xbc, 0x7a, 0x5d, 0x4a,
-	0x7c, 0x9d, 0x11, 0x0c, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x91, 0x95, 0x8c, 0xb9, 0x0c,
-	0x00, 0x00,
+func init() { proto.RegisterFile("storage/raft.proto", fileDescriptor_raft_d6a64da2f1251cf6) }
+
+var fileDescriptor_raft_d6a64da2f1251cf6 = []byte{
+	// 1224 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0x5f, 0x6f, 0xdb, 0x54,
+	0x14, 0x8f, 0x1b, 0x27, 0x71, 0x4e, 0x92, 0xd6, 0xbb, 0x4c, 0x60, 0x85, 0x91, 0x46, 0x1e, 0x1b,
+	0xd9, 0x10, 0xc9, 0xa8, 0x06, 0x0f, 0xbc, 0xe5, 0x8f, 0xbb, 0x66, 0xfd, 0x17, 0xb9, 0x59, 0x11,
+	0x48, 0x53, 0xe4, 0x38, 0xb7, 0x89, 0xd5, 0xc4, 0xd7, 0xb3, 0x6f, 0x06, 0xd9, 0xa7, 0xe0, 0x23,
+	0xf0, 0xca, 0x27, 0xe0, 0x2b, 0xf4, 0x05, 0x69, 0x8f, 0x93, 0x40, 0x15, 0x74, 0x7c, 0x8a, 0x3d,
+	0xa1, 0xfb, 0xc7, 0x69, 0xd6, 0x06, 0xd6, 0x4a, 0x88, 0x17, 0x5e, 0x12, 0xfb, 0x9c, 0xf3, 0xfb,
+	0x1d, 0x9f, 0xbf, 0xf7, 0x02, 0x8a, 0x28, 0x09, 0x9d, 0x21, 0xae, 0x85, 0xce, 0x11, 0xad, 0x06,
+	0x21, 0xa1, 0x04, 0xdd, 0x70, 0x89, 0x7b, 0x1c, 0x12, 0xc7, 0x1d, 0x55, 0xa5, 0xb6, 0x78, 0x93,
+	0xbf, 0x06, 0xfd, 0x1a, 0x0e, 0x43, 0x12, 0x46, 0xc2, 0xb0, 0xf8, 0x7e, 0x2c, 0x9d, 0x60, 0xea,
+	0x0c, 0x1c, 0xea, 0x48, 0xf9, 0x47, 0x31, 0xa9, 0xfc, 0x0f, 0xfa, 0xb5, 0x88, 0x3a, 0x14, 0x4b,
+	0xf5, 0x87, 0x98, 0xba, 0x03, 0xee, 0x90, 0xff, 0x04, 0xfd, 0x05, 0xe7, 0xc5, 0x9b, 0x43, 0x32,
+	0x24, 0xfc, 0xb1, 0xc6, 0x9e, 0x84, 0xd4, 0xfc, 0x39, 0x09, 0x05, 0xdb, 0x39, 0xa2, 0x5b, 0xd8,
+	0x09, 0x69, 0x1f, 0x3b, 0x14, 0xf5, 0x41, 0x0b, 0x1d, 0x7f, 0x88, 0x7b, 0xde, 0xc0, 0x50, 0xca,
+	0x4a, 0x45, 0x6d, 0x3c, 0x3a, 0x39, 0x5d, 0x4f, 0x9c, 0x9d, 0xae, 0x67, 0x6c, 0x26, 0x6f, 0xb7,
+	0xde, 0x9c, 0xae, 0x3f, 0x1c, 0x7a, 0x74, 0x34, 0xed, 0x57, 0x5d, 0x32, 0xa9, 0xcd, 0x83, 0x1a,
+	0xf4, 0xcf, 0x9f, 0x6b, 0xc1, 0xf1, 0xb0, 0x26, 0xa3, 0xa8, 0x4a, 0x9c, 0x9d, 0xe1, 0xc4, 0xed,
+	0x01, 0xfa, 0x0e, 0xd6, 0x8e, 0x42, 0x32, 0xe9, 0x85, 0x38, 0x18, 0x7b, 0xae, 0xc3, 0x5c, 0xad,
+	0x94, 0x95, 0x4a, 0xa1, 0xb1, 0x2f, 0x5d, 0x15, 0x36, 0x43, 0x32, 0xb1, 0x85, 0x96, 0x3b, 0xfc,
+	0xf2, 0x7a, 0x0e, 0x63, 0xa4, 0x5d, 0x38, 0x5a, 0x20, 0x1a, 0xa0, 0x67, 0x50, 0xa0, 0x64, 0xd1,
+	0x6d, 0x92, 0xbb, 0xdd, 0x95, 0x6e, 0x73, 0x5d, 0xf2, 0x6f, 0x38, 0xcd, 0x51, 0x72, 0xee, 0xd2,
+	0x00, 0x95, 0xe2, 0x70, 0x62, 0xa8, 0x3c, 0x97, 0x2a, 0xf3, 0x64, 0x73, 0x09, 0xba, 0x05, 0x69,
+	0x97, 0x4c, 0x26, 0x1e, 0x35, 0x52, 0x0b, 0x3a, 0x29, 0x43, 0x25, 0xc8, 0x3c, 0x9b, 0x7a, 0x38,
+	0x72, 0xb1, 0x91, 0x2e, 0x2b, 0x15, 0x4d, 0xaa, 0x63, 0xa1, 0xf9, 0xab, 0x0a, 0x88, 0x55, 0x6e,
+	0x17, 0x47, 0x91, 0x33, 0xc4, 0x36, 0x7e, 0x36, 0xc5, 0xd1, 0x7f, 0x53, 0xbe, 0x5d, 0xc8, 0x2f,
+	0x96, 0x8f, 0xd7, 0x2e, 0xb7, 0xf1, 0x71, 0xf5, 0xbc, 0xbd, 0x2f, 0xe4, 0xa4, 0x85, 0x23, 0x37,
+	0xf4, 0x02, 0x4a, 0x42, 0x19, 0x45, 0x6e, 0xa1, 0x2c, 0xa8, 0x0d, 0x70, 0x5e, 0x14, 0x5e, 0x91,
+	0xeb, 0x91, 0x65, 0xe7, 0xe9, 0x46, 0x35, 0xc8, 0x4c, 0x44, 0x3e, 0x78, 0xbe, 0x73, 0x1b, 0x6b,
+	0x55, 0x31, 0x09, 0x55, 0x99, 0xa6, 0x38, 0x8b, 0xd2, 0x6a, 0x31, 0xcb, 0xa9, 0x25, 0x59, 0x46,
+	0x9b, 0x00, 0xa3, 0x78, 0x34, 0x22, 0x23, 0x5d, 0x4e, 0x56, 0x72, 0x1b, 0xe5, 0xea, 0xa5, 0x39,
+	0xae, 0xbe, 0x35, 0x43, 0x92, 0x64, 0x01, 0x89, 0xf6, 0x61, 0x6d, 0xfe, 0xd6, 0x0b, 0x71, 0x14,
+	0x44, 0x46, 0xe6, 0x5a, 0x64, 0xab, 0x73, 0xb8, 0xcd, 0xd0, 0xe8, 0x29, 0xac, 0x89, 0x3a, 0x47,
+	0xd4, 0x09, 0x69, 0xef, 0x18, 0xcf, 0x0c, 0xad, 0xac, 0x54, 0xf2, 0x8d, 0x2f, 0xde, 0x9c, 0xae,
+	0x7f, 0x7e, 0xbd, 0xfa, 0x6e, 0xe3, 0x99, 0x5d, 0xe0, 0x6c, 0x07, 0x8c, 0x6c, 0x1b, 0xcf, 0xcc,
+	0x3e, 0x7c, 0x70, 0xb9, 0xb9, 0x1a, 0x0e, 0x75, 0x47, 0xe8, 0x11, 0x68, 0xa1, 0x78, 0x8f, 0x0c,
+	0x85, 0xc7, 0x70, 0xe7, 0x6f, 0x62, 0xb8, 0x80, 0x16, 0x81, 0xcc, 0xc1, 0x66, 0x07, 0x8c, 0xb7,
+	0xac, 0xa2, 0x80, 0xf8, 0x11, 0x7e, 0xe2, 0x7b, 0xc4, 0x47, 0x55, 0x48, 0xf1, 0x8d, 0xc8, 0x7b,
+	0x38, 0xb7, 0x61, 0x2c, 0x69, 0x07, 0x8b, 0xe9, 0x6d, 0x61, 0xf6, 0x95, 0x7a, 0xf2, 0xe3, 0xba,
+	0x62, 0xfe, 0xb6, 0x02, 0xef, 0x2d, 0xa1, 0xfc, 0x9f, 0x0f, 0xc5, 0x23, 0x48, 0x4d, 0x59, 0x52,
+	0xe5, 0x48, 0x7c, 0xfa, 0xae, 0x6a, 0x2d, 0xd4, 0x41, 0x92, 0x09, 0xbc, 0xf9, 0x67, 0x1a, 0xd6,
+	0x0e, 0x7c, 0x27, 0x88, 0x46, 0x84, 0xc6, 0xfb, 0xa6, 0x0e, 0xe9, 0x11, 0x76, 0x06, 0x38, 0xae,
+	0xd4, 0xbd, 0x25, 0xec, 0x17, 0x30, 0xd5, 0x2d, 0x0e, 0xb0, 0x25, 0x10, 0xdd, 0x05, 0xed, 0xf8,
+	0x79, 0xaf, 0xcf, 0x9a, 0x8b, 0x67, 0x2d, 0xdf, 0xc8, 0xb1, 0xca, 0x6c, 0x1f, 0xf2, 0x7e, 0xb3,
+	0x33, 0xc7, 0xcf, 0x45, 0xe3, 0xad, 0x43, 0x6e, 0x4c, 0x86, 0x3d, 0xec, 0xd3, 0xd0, 0xc3, 0x91,
+	0x91, 0x2c, 0x27, 0x2b, 0x79, 0x1b, 0xc6, 0x64, 0x68, 0x09, 0x09, 0x2a, 0x42, 0xea, 0xc8, 0xf3,
+	0x9d, 0x31, 0x0f, 0x34, 0x1e, 0x65, 0x21, 0x2a, 0xfe, 0xa4, 0x42, 0x5a, 0xf8, 0x45, 0x4f, 0xe1,
+	0x26, 0x5b, 0x0a, 0x3d, 0xb9, 0x03, 0x7a, 0xb2, 0x21, 0x65, 0xc5, 0xae, 0xd5, 0xcc, 0x28, 0xbc,
+	0xbc, 0x81, 0x6f, 0x03, 0xc8, 0xc9, 0xf4, 0x5e, 0x60, 0x5e, 0xb9, 0x64, 0x5c, 0x13, 0x31, 0x63,
+	0xde, 0x0b, 0x8c, 0xee, 0x40, 0xce, 0x75, 0xfc, 0xde, 0x00, 0xbb, 0x63, 0xcf, 0xc7, 0x6f, 0x7d,
+	0x30, 0xb8, 0x8e, 0xdf, 0x12, 0x72, 0x64, 0x41, 0x8a, 0x1f, 0xf0, 0x7c, 0x39, 0x2d, 0x4f, 0xee,
+	0xfc, 0x2a, 0x10, 0xb7, 0xc2, 0x01, 0x03, 0xc4, 0xc1, 0x73, 0x34, 0xda, 0x05, 0x2d, 0x08, 0x3d,
+	0x12, 0x7a, 0x74, 0xc6, 0x0f, 0x93, 0xd5, 0xa5, 0x4d, 0x70, 0xb1, 0x4c, 0x1d, 0x09, 0x89, 0x07,
+	0x37, 0xa6, 0x60, 0x74, 0x11, 0x0d, 0x1d, 0x8a, 0x87, 0x33, 0x23, 0x73, 0x65, 0xba, 0x03, 0x09,
+	0x89, 0xe9, 0x62, 0x0a, 0xb4, 0x09, 0xb7, 0xa6, 0xbe, 0xec, 0x74, 0x8a, 0x07, 0x3d, 0x1a, 0x4e,
+	0x7d, 0xf1, 0x24, 0x62, 0xd7, 0x16, 0x92, 0x53, 0x5c, 0xb4, 0xec, 0xc6, 0x86, 0x3c, 0x64, 0x54,
+	0x07, 0x95, 0xce, 0x02, 0x6c, 0x64, 0xf9, 0x27, 0x7d, 0x72, 0x85, 0x4f, 0xea, 0xce, 0x02, 0x3c,
+	0x3f, 0x92, 0x67, 0x01, 0x7e, 0xac, 0x6a, 0x8a, 0xbe, 0x62, 0x3e, 0x04, 0x2d, 0x8e, 0x1d, 0xe5,
+	0x20, 0xf3, 0x64, 0x6f, 0x7b, 0x6f, 0xff, 0xeb, 0x3d, 0x3d, 0x81, 0xf2, 0xa0, 0xd9, 0x56, 0x73,
+	0xff, 0xd0, 0xb2, 0xbf, 0xd1, 0x15, 0x54, 0x80, 0xac, 0x6d, 0x35, 0xea, 0x3b, 0xf5, 0xbd, 0xa6,
+	0xa5, 0xaf, 0x98, 0x06, 0x68, 0x71, 0x88, 0xcc, 0x70, 0xfb, 0xb0, 0xd7, 0xa8, 0x77, 0x9b, 0x5b,
+	0x7a, 0xc2, 0xfc, 0x0c, 0x54, 0xe6, 0x09, 0x69, 0xa0, 0xda, 0xf5, 0xcd, 0xae, 0x9e, 0x60, 0xac,
+	0x3b, 0x56, 0xdd, 0xde, 0xb3, 0x6c, 0x5d, 0x41, 0xab, 0x00, 0x1d, 0xdb, 0xb2, 0x76, 0x3b, 0xdd,
+	0xf6, 0x21, 0x23, 0xfa, 0x45, 0x01, 0xfd, 0xfc, 0x4b, 0xe5, 0x0a, 0xdb, 0x82, 0x34, 0xcb, 0xc6,
+	0x34, 0xe2, 0x73, 0xb6, 0xba, 0x71, 0xff, 0x1f, 0xc3, 0x13, 0xa0, 0xea, 0x01, 0x47, 0xc4, 0x17,
+	0x0b, 0x81, 0x67, 0x47, 0x5e, 0x7c, 0x46, 0xb2, 0x8e, 0xcf, 0x5e, 0x38, 0x12, 0xcd, 0x36, 0xa4,
+	0x05, 0xee, 0x52, 0xec, 0xf5, 0x66, 0xd3, 0xea, 0x74, 0xad, 0x96, 0xae, 0x30, 0x55, 0xbd, 0xd3,
+	0xd9, 0x69, 0x5b, 0x2d, 0x7d, 0x05, 0x65, 0x21, 0x65, 0xd9, 0xf6, 0xbe, 0xad, 0x27, 0x99, 0x55,
+	0xcb, 0x6a, 0xee, 0xb4, 0xf7, 0xac, 0x96, 0xae, 0x3e, 0x56, 0xb5, 0xa4, 0xae, 0x9a, 0x3d, 0xb8,
+	0xd1, 0x24, 0xfe, 0x51, 0x73, 0xc4, 0xba, 0xbf, 0x49, 0x7c, 0x8a, 0xbf, 0xa7, 0xe8, 0x01, 0x00,
+	0xbb, 0xe8, 0x38, 0xfe, 0x20, 0x5e, 0xca, 0xd9, 0xc6, 0x0d, 0xb9, 0x94, 0xb3, 0x4d, 0xa1, 0x69,
+	0xb7, 0xec, 0xac, 0x34, 0xe2, 0x17, 0xa9, 0x4c, 0xe0, 0xcc, 0xc6, 0xc4, 0x11, 0x97, 0xc5, 0xbc,
+	0x1d, 0xbf, 0x6e, 0xbc, 0x52, 0x20, 0xbb, 0x3b, 0x1d, 0x53, 0x8f, 0xcd, 0x29, 0x1a, 0x83, 0xbe,
+	0x30, 0xaf, 0x62, 0x75, 0xdc, 0xbf, 0xda, 0x50, 0x33, 0xdb, 0xe2, 0xdd, 0xab, 0xed, 0x47, 0x33,
+	0x51, 0x51, 0x1e, 0x28, 0xe8, 0x29, 0xe4, 0x99, 0x32, 0x4e, 0x3d, 0x32, 0xdf, 0xdd, 0x76, 0xc5,
+	0xdb, 0x57, 0xa8, 0x9d, 0xa0, 0x6f, 0xdc, 0x3b, 0xf9, 0xa3, 0x94, 0x38, 0x39, 0x2b, 0x29, 0x2f,
+	0xcf, 0x4a, 0xca, 0xab, 0xb3, 0x92, 0xf2, 0xfb, 0x59, 0x49, 0xf9, 0xe1, 0x75, 0x29, 0xf1, 0xf2,
+	0x75, 0x29, 0xf1, 0xea, 0x75, 0x29, 0xf1, 0x6d, 0x46, 0x32, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff,
+	0x38, 0x31, 0xfb, 0x9d, 0x72, 0x0c, 0x00, 0x00,
 }
diff --git a/pkg/storage/raft.proto b/pkg/storage/raft.proto
index 14535540650d..b008a8cada9f 100644
--- a/pkg/storage/raft.proto
+++ b/pkg/storage/raft.proto
@@ -200,9 +200,6 @@ message ConfChangeContext {
   // Payload is the application-level command (i.e. an encoded
   // storagepb.RaftCommand).
   optional bytes payload = 2;
-
-  // Replica contains full details about the replica being added or removed.
-  optional roachpb.ReplicaDescriptor replica = 3 [(gogoproto.nullable) = false];
 }
 
 service MultiRaft {
diff --git a/pkg/storage/replica_application_result.go b/pkg/storage/replica_application_result.go
index 49f97ec27b69..42ee3c148b16 100644
--- a/pkg/storage/replica_application_result.go
+++ b/pkg/storage/replica_application_result.go
@@ -294,12 +294,15 @@ func (r *Replica) handleComputeChecksumResult(ctx context.Context, cc *storagepb
 }
 
 func (r *Replica) handleChangeReplicasResult(ctx context.Context, chng *storagepb.ChangeReplicas) {
-	if chng.ChangeType == roachpb.REMOVE_REPLICA && r.store.StoreID() == chng.Replica.StoreID {
-		// This wants to run as late as possible, maximizing the chances
-		// that the other nodes have finished this command as well (since
-		// processing the removal from the queue looks up the Range at the
-		// lease holder, being too early here turns this into a no-op).
-		r.store.replicaGCQueue.AddAsync(ctx, r, replicaGCPriorityRemoved)
+	for _, rDesc := range chng.Removed() {
+		if r.store.StoreID() == rDesc.StoreID {
+			// This wants to run as late as possible, maximizing the chances
+			// that the other nodes have finished this command as well (since
+			// processing the removal from the queue looks up the Range at the
+			// lease holder, being too early here turns this into a no-op).
+			r.store.replicaGCQueue.AddAsync(ctx, r, replicaGCPriorityRemoved)
+			break
+		}
 	}
 }
 
diff --git a/pkg/storage/replica_command.go b/pkg/storage/replica_command.go
index fb4ec63eb805..5fe3ae59959a 100644
--- a/pkg/storage/replica_command.go
+++ b/pkg/storage/replica_command.go
@@ -1218,14 +1218,34 @@ func execChangeReplicasTxn(
 			return err
 		}
 
+		var crt *roachpb.ChangeReplicasTrigger
+		if !store.ClusterSettings().Version.IsActive(cluster.VersionAtomicChangeReplicasTrigger) {
+			crt = &roachpb.ChangeReplicasTrigger{
+				DeprecatedChangeType: changeType,
+				DeprecatedReplica:    repDesc,
+				Desc:                 updatedDesc,
+			}
+		} else {
+			var added, removed []roachpb.ReplicaDescriptor
+			switch changeType {
+			case roachpb.ADD_REPLICA:
+				added = append(added, repDesc)
+			case roachpb.REMOVE_REPLICA:
+				removed = append(removed, repDesc)
+			default:
+				return errors.Errorf("unknown change type: %d", changeType)
+			}
+			crt = &roachpb.ChangeReplicasTrigger{
+				Desc:                    updatedDesc,
+				InternalAddedReplicas:   added,
+				InternalRemovedReplicas: removed,
+			}
+		}
+
 		b.AddRawRequest(&roachpb.EndTransactionRequest{
 			Commit: true,
 			InternalCommitTrigger: &roachpb.InternalCommitTrigger{
-				ChangeReplicasTrigger: &roachpb.ChangeReplicasTrigger{
-					ChangeType: changeType,
-					Replica:    repDesc,
-					Desc:       updatedDesc,
-				},
+				ChangeReplicasTrigger: crt,
 			},
 		})
 		if err := txn.Run(ctx, b); err != nil {
diff --git a/pkg/storage/replica_proposal_buf.go b/pkg/storage/replica_proposal_buf.go
index 22ccc1e421a9..6b82c166bfb3 100644
--- a/pkg/storage/replica_proposal_buf.go
+++ b/pkg/storage/replica_proposal_buf.go
@@ -18,6 +18,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/protoutil"
+	"github.com/cockroachdb/errors"
 	"go.etcd.io/etcd/raft"
 	"go.etcd.io/etcd/raft/raftpb"
 )
@@ -437,7 +438,6 @@ func (b *propBuf) FlushLockedWithRaftGroup(raftGroup *raft.RawNode) error {
 			confChangeCtx := ConfChangeContext{
 				CommandID: string(p.idKey),
 				Payload:   p.encodedCommand,
-				Replica:   crt.Replica,
 			}
 			encodedCtx, err := protoutil.Marshal(&confChangeCtx)
 			if err != nil {
@@ -445,15 +445,33 @@ func (b *propBuf) FlushLockedWithRaftGroup(raftGroup *raft.RawNode) error {
 				continue
 			}
 
+			added, removed := crt.Added(), crt.Removed()
+			if len(added)+len(removed) != 1 {
+				log.Fatalf(context.TODO(), "atomic replication changes not supported yet")
+			}
+
+			var changeType raftpb.ConfChangeType
+			var replicaID roachpb.ReplicaID
+			if len(added) > 0 {
+				replicaID = added[0].ReplicaID
+				typ := added[0].GetType()
+				switch typ {
+				case roachpb.ReplicaType_VOTER:
+					changeType = raftpb.ConfChangeAddNode
+				case roachpb.ReplicaType_LEARNER:
+					changeType = raftpb.ConfChangeAddLearnerNode
+				default:
+					panic(errors.Errorf("unknown replica type %v", typ))
+				}
+			} else {
+				changeType, replicaID = raftpb.ConfChangeRemoveNode, removed[0].ReplicaID
+			}
+
 			confChange := raftpb.ConfChange{
-				Type:    changeTypeInternalToRaft[crt.ChangeType],
-				NodeID:  uint64(crt.Replica.ReplicaID),
+				Type:    changeType,
+				NodeID:  uint64(replicaID),
 				Context: encodedCtx,
 			}
-			if confChange.Type == raftpb.ConfChangeAddNode &&
-				crt.Replica.GetType() == roachpb.ReplicaType_LEARNER {
-				confChange.Type = raftpb.ConfChangeAddLearnerNode
-			}
 			if err := raftGroup.ProposeConfChange(
 				confChange,
 			); err != nil && err != raft.ErrProposalDropped {
diff --git a/pkg/storage/replica_raft.go b/pkg/storage/replica_raft.go
index 60c6402d690d..62b3852e586f 100644
--- a/pkg/storage/replica_raft.go
+++ b/pkg/storage/replica_raft.go
@@ -297,11 +297,14 @@ func (r *Replica) propose(ctx context.Context, p *ProposalData) (index int64, pE
 		// based range leases). This shouldn't happen often, but has been seen
 		// before (#12591).
 		replID := p.command.ProposerReplica.ReplicaID
-		if crt.ChangeType == roachpb.REMOVE_REPLICA && crt.Replica.ReplicaID == replID {
-			msg := fmt.Sprintf("received invalid ChangeReplicasTrigger %s to remove self (leaseholder)", crt)
-			log.Error(p.ctx, msg)
-			return 0, roachpb.NewErrorf("%s: %s", r, msg)
+		for _, rDesc := range crt.Removed() {
+			if rDesc.ReplicaID == replID {
+				msg := fmt.Sprintf("received invalid ChangeReplicasTrigger %s to remove self (leaseholder)", crt)
+				log.Error(p.ctx, msg)
+				return 0, roachpb.NewErrorf("%s: %s", r, msg)
+			}
 		}
+
 	} else if p.command.ReplicatedEvalResult.AddSSTable != nil {
 		log.VEvent(p.ctx, 4, "sideloadable proposal detected")
 		version = raftVersionSideloaded
diff --git a/pkg/storage/store.go b/pkg/storage/store.go
index 05a276f6b239..0c15cd161879 100644
--- a/pkg/storage/store.go
+++ b/pkg/storage/store.go
@@ -95,11 +95,6 @@ const (
 	systemDataGossipInterval = 1 * time.Minute
 )
 
-var changeTypeInternalToRaft = map[roachpb.ReplicaChangeType]raftpb.ConfChangeType{
-	roachpb.ADD_REPLICA:    raftpb.ConfChangeAddNode,
-	roachpb.REMOVE_REPLICA: raftpb.ConfChangeRemoveNode,
-}
-
 var storeSchedulerConcurrency = envutil.EnvOrDefaultInt(
 	"COCKROACH_SCHEDULER_CONCURRENCY", 8*runtime.NumCPU())