diff --git a/.golangci.yml b/.golangci.yml
index 48721a08dcb..3a3db4d9a05 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -23,6 +23,12 @@ linters:
     - gofmt
     - goimports
 
+issues:
+  exclude-rules:
+    - path: '^go/vt/proto/'
+      linters:
+      - goimports
+
 # https://github.com/golangci/golangci/wiki/Configuration
 service:
   golangci-lint-version: 1.31.0 # use the fixed version to not introduce new linters unexpectedly
diff --git a/Makefile b/Makefile
index 9665853baa3..ec76f50b51a 100644
--- a/Makefile
+++ b/Makefile
@@ -179,10 +179,10 @@ ifndef NOBANNER
 	echo $$(date): Compiling proto definitions
 endif
 
-$(PROTO_GO_OUTS): install_protoc-gen-go proto/*.proto
+$(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 	for name in $(PROTO_SRC_NAMES); do \
-		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -Iproto proto/$${name}.proto && \
-		goimports -local vitess.io/vitess -w vitess.io/vitess/go/vt/proto/$${name}/$${name}.pb.go; \
+		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -I${PWD}/dist/vt-protoc-3.6.1/include:proto proto/$${name}.proto && \
+		goimports -w vitess.io/vitess/go/vt/proto/$${name}/$${name}.pb.go; \
 	done
 	cp -Rf vitess.io/vitess/go/vt/proto/* go/vt/proto
 	rm -rf vitess.io/vitess/go/vt/proto/
diff --git a/examples/local/101_initial_cluster.sh b/examples/local/101_initial_cluster.sh
index 5d42d908f6e..40c83ad8ec8 100755
--- a/examples/local/101_initial_cluster.sh
+++ b/examples/local/101_initial_cluster.sh
@@ -38,7 +38,7 @@ for i in 100 101 102; do
 done
 
 # set one of the replicas to master
-vtctlclient InitShardMaster -force commerce/0 zone1-100
+vtctldclient InitShardPrimary --force commerce/0 zone1-100
 
 # create the schema
 vtctlclient ApplySchema -sql-file create_commerce_schema.sql commerce
diff --git a/examples/local/201_customer_tablets.sh b/examples/local/201_customer_tablets.sh
index b53ffb6cd16..bb7ef6d531f 100755
--- a/examples/local/201_customer_tablets.sh
+++ b/examples/local/201_customer_tablets.sh
@@ -25,4 +25,4 @@ for i in 200 201 202; do
 	CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient InitShardMaster -force customer/0 zone1-200
+vtctldclient InitShardPrimary --force customer/0 zone1-200
diff --git a/examples/local/302_new_shards.sh b/examples/local/302_new_shards.sh
index 33f2ec294e1..3aede2b3d6e 100755
--- a/examples/local/302_new_shards.sh
+++ b/examples/local/302_new_shards.sh
@@ -29,5 +29,5 @@ for i in 400 401 402; do
 	SHARD=80- CELL=zone1 KEYSPACE=customer TABLET_UID=$i ./scripts/vttablet-up.sh
 done
 
-vtctlclient InitShardMaster -force customer/-80 zone1-300
-vtctlclient InitShardMaster -force customer/80- zone1-400
+vtctldclient InitShardPrimary --force customer/-80 zone1-300
+vtctldclient InitShardPrimary --force customer/80- zone1-400
diff --git a/examples/local/env.sh b/examples/local/env.sh
index c0b982a3dbe..e66871478ce 100644
--- a/examples/local/env.sh
+++ b/examples/local/env.sh
@@ -76,6 +76,7 @@ mkdir -p "${VTDATAROOT}/tmp"
 
 alias mysql="command mysql -h 127.0.0.1 -P 15306"
 alias vtctlclient="command vtctlclient -server localhost:15999 -log_dir ${VTDATAROOT}/tmp -alsologtostderr"
+alias vtctldclient="command vtctldclient --server localhost:15999"
 
 # Make sure aliases are expanded in non-interactive shell
 shopt -s expand_aliases
diff --git a/go/cmd/vtctldclient/commands.go b/go/cmd/vtctldclient/commands.go
index 951b04f8679..d10ceecac14 100644
--- a/go/cmd/vtctldclient/commands.go
+++ b/go/cmd/vtctldclient/commands.go
@@ -19,10 +19,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"time"
 
+	"github.com/golang/protobuf/ptypes"
 	"github.com/spf13/cobra"
 
+	"vitess.io/vitess/go/vt/log"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+	"vitess.io/vitess/go/vt/topo/topoproto"
 )
 
 var (
@@ -44,6 +48,11 @@ var (
 		Args:    cobra.NoArgs,
 		RunE:    commandGetKeyspaces,
 	}
+	initShardPrimaryCmd = &cobra.Command{
+		Use:  "InitShardPrimary",
+		Args: cobra.ExactArgs(2),
+		RunE: commandInitShardPrimary,
+	}
 )
 
 func commandFindAllShardsInKeyspace(cmd *cobra.Command, args []string) error {
@@ -91,8 +100,43 @@ func commandGetKeyspaces(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+var initShardPrimaryArgs = struct {
+	WaitReplicasTimeout time.Duration
+	Force               bool
+}{}
+
+func commandInitShardPrimary(cmd *cobra.Command, args []string) error {
+	keyspace, shard, err := topoproto.ParseKeyspaceShard(cmd.Flags().Arg(0))
+	if err != nil {
+		return err
+	}
+
+	tabletAlias, err := topoproto.ParseTabletAlias(cmd.Flags().Arg(1))
+	if err != nil {
+		return err
+	}
+
+	resp, err := client.InitShardPrimary(commandCtx, &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                keyspace,
+		Shard:                   shard,
+		PrimaryElectTabletAlias: tabletAlias,
+		WaitReplicasTimeout:     ptypes.DurationProto(initShardPrimaryArgs.WaitReplicasTimeout),
+		Force:                   initShardPrimaryArgs.Force,
+	})
+
+	for _, event := range resp.Events {
+		log.Infof("%v", event)
+	}
+
+	return err
+}
+
 func init() {
 	rootCmd.AddCommand(findAllShardsInKeyspaceCmd)
 	rootCmd.AddCommand(getKeyspaceCmd)
 	rootCmd.AddCommand(getKeyspacesCmd)
+
+	initShardPrimaryCmd.Flags().DurationVar(&initShardPrimaryArgs.WaitReplicasTimeout, "wait-replicas-timeout", 30*time.Second, "time to wait for replicas to catch up in reparenting")
+	initShardPrimaryCmd.Flags().BoolVar(&initShardPrimaryArgs.Force, "force", false, "will force the reparent even if the provided tablet is not a master or the shard master")
+	rootCmd.AddCommand(initShardPrimaryCmd)
 }
diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go
index 2dc222239ce..bc2062f6620 100644
--- a/go/vt/proto/automationservice/automationservice.pb.go
+++ b/go/vt/proto/automationservice/automationservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	automation "vitess.io/vitess/go/vt/proto/automation"
 )
 
diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go
index eab38ace6dc..75a2108d406 100644
--- a/go/vt/proto/binlogdata/binlogdata.pb.go
+++ b/go/vt/proto/binlogdata/binlogdata.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	query "vitess.io/vitess/go/vt/proto/query"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go
index 0d2d06418fa..77312b91234 100644
--- a/go/vt/proto/binlogservice/binlogservice.pb.go
+++ b/go/vt/proto/binlogservice/binlogservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 )
 
diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go
index d51f2962abb..ce7f38070a3 100644
--- a/go/vt/proto/logutil/logutil.pb.go
+++ b/go/vt/proto/logutil/logutil.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	vttime "vitess.io/vitess/go/vt/proto/vttime"
 )
 
diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go
index fccfb46ffe5..b6d553da9e9 100644
--- a/go/vt/proto/query/query.pb.go
+++ b/go/vt/proto/query/query.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpc "vitess.io/vitess/go/vt/proto/vtrpc"
 )
diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go
index 7553788d1cc..c166a0c54f5 100644
--- a/go/vt/proto/queryservice/queryservice.pb.go
+++ b/go/vt/proto/queryservice/queryservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	query "vitess.io/vitess/go/vt/proto/query"
 )
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
index d6dfc5f5160..18d66d9896d 100644
--- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
+++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 	query "vitess.io/vitess/go/vt/proto/query"
 	replicationdata "vitess.io/vitess/go/vt/proto/replicationdata"
diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
index 338257b4306..649fdbd479c 100644
--- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
+++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
 )
 
diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go
index 5e0289c73bc..a9270a8df55 100644
--- a/go/vt/proto/throttlerservice/throttlerservice.pb.go
+++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata"
 )
 
diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go
index 98306ac985e..4af0f18b960 100644
--- a/go/vt/proto/topodata/topodata.pb.go
+++ b/go/vt/proto/topodata/topodata.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	vttime "vitess.io/vitess/go/vt/proto/vttime"
 )
 
diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go
index 0cdf2bb471e..d2381807d76 100644
--- a/go/vt/proto/vschema/vschema.pb.go
+++ b/go/vt/proto/vschema/vschema.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	query "vitess.io/vitess/go/vt/proto/query"
 )
 
diff --git a/go/vt/proto/vtadmin/vtadmin.pb.go b/go/vt/proto/vtadmin/vtadmin.pb.go
index c65c6cc7f42..404321e4e11 100644
--- a/go/vt/proto/vtadmin/vtadmin.pb.go
+++ b/go/vt/proto/vtadmin/vtadmin.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 )
 
diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go
index 3d648080931..67e4403037a 100644
--- a/go/vt/proto/vtctldata/vtctldata.pb.go
+++ b/go/vt/proto/vtctldata/vtctldata.pb.go
@@ -8,7 +8,7 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
+	duration "github.com/golang/protobuf/ptypes/duration"
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
 )
@@ -261,6 +261,116 @@ func (m *GetKeyspaceResponse) GetKeyspace() *Keyspace {
 	return nil
 }
 
+type InitShardPrimaryRequest struct {
+	Keyspace                string                `protobuf:"bytes,1,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
+	Shard                   string                `protobuf:"bytes,2,opt,name=shard,proto3" json:"shard,omitempty"`
+	PrimaryElectTabletAlias *topodata.TabletAlias `protobuf:"bytes,3,opt,name=primary_elect_tablet_alias,json=primaryElectTabletAlias,proto3" json:"primary_elect_tablet_alias,omitempty"`
+	Force                   bool                  `protobuf:"varint,4,opt,name=force,proto3" json:"force,omitempty"`
+	WaitReplicasTimeout     *duration.Duration    `protobuf:"bytes,5,opt,name=wait_replicas_timeout,json=waitReplicasTimeout,proto3" json:"wait_replicas_timeout,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}              `json:"-"`
+	XXX_unrecognized        []byte                `json:"-"`
+	XXX_sizecache           int32                 `json:"-"`
+}
+
+func (m *InitShardPrimaryRequest) Reset()         { *m = InitShardPrimaryRequest{} }
+func (m *InitShardPrimaryRequest) String() string { return proto.CompactTextString(m) }
+func (*InitShardPrimaryRequest) ProtoMessage()    {}
+func (*InitShardPrimaryRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f41247b323a1ab2e, []int{6}
+}
+
+func (m *InitShardPrimaryRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InitShardPrimaryRequest.Unmarshal(m, b)
+}
+func (m *InitShardPrimaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InitShardPrimaryRequest.Marshal(b, m, deterministic)
+}
+func (m *InitShardPrimaryRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InitShardPrimaryRequest.Merge(m, src)
+}
+func (m *InitShardPrimaryRequest) XXX_Size() int {
+	return xxx_messageInfo_InitShardPrimaryRequest.Size(m)
+}
+func (m *InitShardPrimaryRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_InitShardPrimaryRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InitShardPrimaryRequest proto.InternalMessageInfo
+
+func (m *InitShardPrimaryRequest) GetKeyspace() string {
+	if m != nil {
+		return m.Keyspace
+	}
+	return ""
+}
+
+func (m *InitShardPrimaryRequest) GetShard() string {
+	if m != nil {
+		return m.Shard
+	}
+	return ""
+}
+
+func (m *InitShardPrimaryRequest) GetPrimaryElectTabletAlias() *topodata.TabletAlias {
+	if m != nil {
+		return m.PrimaryElectTabletAlias
+	}
+	return nil
+}
+
+func (m *InitShardPrimaryRequest) GetForce() bool {
+	if m != nil {
+		return m.Force
+	}
+	return false
+}
+
+func (m *InitShardPrimaryRequest) GetWaitReplicasTimeout() *duration.Duration {
+	if m != nil {
+		return m.WaitReplicasTimeout
+	}
+	return nil
+}
+
+type InitShardPrimaryResponse struct {
+	Events               []*logutil.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *InitShardPrimaryResponse) Reset()         { *m = InitShardPrimaryResponse{} }
+func (m *InitShardPrimaryResponse) String() string { return proto.CompactTextString(m) }
+func (*InitShardPrimaryResponse) ProtoMessage()    {}
+func (*InitShardPrimaryResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f41247b323a1ab2e, []int{7}
+}
+
+func (m *InitShardPrimaryResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_InitShardPrimaryResponse.Unmarshal(m, b)
+}
+func (m *InitShardPrimaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_InitShardPrimaryResponse.Marshal(b, m, deterministic)
+}
+func (m *InitShardPrimaryResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InitShardPrimaryResponse.Merge(m, src)
+}
+func (m *InitShardPrimaryResponse) XXX_Size() int {
+	return xxx_messageInfo_InitShardPrimaryResponse.Size(m)
+}
+func (m *InitShardPrimaryResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_InitShardPrimaryResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_InitShardPrimaryResponse proto.InternalMessageInfo
+
+func (m *InitShardPrimaryResponse) GetEvents() []*logutil.Event {
+	if m != nil {
+		return m.Events
+	}
+	return nil
+}
+
 type Keyspace struct {
 	Name                 string             `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Keyspace             *topodata.Keyspace `protobuf:"bytes,2,opt,name=keyspace,proto3" json:"keyspace,omitempty"`
@@ -273,7 +383,7 @@ func (m *Keyspace) Reset()         { *m = Keyspace{} }
 func (m *Keyspace) String() string { return proto.CompactTextString(m) }
 func (*Keyspace) ProtoMessage()    {}
 func (*Keyspace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{6}
+	return fileDescriptor_f41247b323a1ab2e, []int{8}
 }
 
 func (m *Keyspace) XXX_Unmarshal(b []byte) error {
@@ -319,7 +429,7 @@ func (m *FindAllShardsInKeyspaceRequest) Reset()         { *m = FindAllShardsInK
 func (m *FindAllShardsInKeyspaceRequest) String() string { return proto.CompactTextString(m) }
 func (*FindAllShardsInKeyspaceRequest) ProtoMessage()    {}
 func (*FindAllShardsInKeyspaceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{7}
+	return fileDescriptor_f41247b323a1ab2e, []int{9}
 }
 
 func (m *FindAllShardsInKeyspaceRequest) XXX_Unmarshal(b []byte) error {
@@ -358,7 +468,7 @@ func (m *FindAllShardsInKeyspaceResponse) Reset()         { *m = FindAllShardsIn
 func (m *FindAllShardsInKeyspaceResponse) String() string { return proto.CompactTextString(m) }
 func (*FindAllShardsInKeyspaceResponse) ProtoMessage()    {}
 func (*FindAllShardsInKeyspaceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{8}
+	return fileDescriptor_f41247b323a1ab2e, []int{10}
 }
 
 func (m *FindAllShardsInKeyspaceResponse) XXX_Unmarshal(b []byte) error {
@@ -399,7 +509,7 @@ func (m *Shard) Reset()         { *m = Shard{} }
 func (m *Shard) String() string { return proto.CompactTextString(m) }
 func (*Shard) ProtoMessage()    {}
 func (*Shard) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{9}
+	return fileDescriptor_f41247b323a1ab2e, []int{11}
 }
 
 func (m *Shard) XXX_Unmarshal(b []byte) error {
@@ -459,7 +569,7 @@ func (m *TableMaterializeSettings) Reset()         { *m = TableMaterializeSettin
 func (m *TableMaterializeSettings) String() string { return proto.CompactTextString(m) }
 func (*TableMaterializeSettings) ProtoMessage()    {}
 func (*TableMaterializeSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{10}
+	return fileDescriptor_f41247b323a1ab2e, []int{12}
 }
 
 func (m *TableMaterializeSettings) XXX_Unmarshal(b []byte) error {
@@ -522,7 +632,7 @@ func (m *MaterializeSettings) Reset()         { *m = MaterializeSettings{} }
 func (m *MaterializeSettings) String() string { return proto.CompactTextString(m) }
 func (*MaterializeSettings) ProtoMessage()    {}
 func (*MaterializeSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f41247b323a1ab2e, []int{11}
+	return fileDescriptor_f41247b323a1ab2e, []int{13}
 }
 
 func (m *MaterializeSettings) XXX_Unmarshal(b []byte) error {
@@ -599,6 +709,8 @@ func init() {
 	proto.RegisterType((*GetKeyspacesResponse)(nil), "vtctldata.GetKeyspacesResponse")
 	proto.RegisterType((*GetKeyspaceRequest)(nil), "vtctldata.GetKeyspaceRequest")
 	proto.RegisterType((*GetKeyspaceResponse)(nil), "vtctldata.GetKeyspaceResponse")
+	proto.RegisterType((*InitShardPrimaryRequest)(nil), "vtctldata.InitShardPrimaryRequest")
+	proto.RegisterType((*InitShardPrimaryResponse)(nil), "vtctldata.InitShardPrimaryResponse")
 	proto.RegisterType((*Keyspace)(nil), "vtctldata.Keyspace")
 	proto.RegisterType((*FindAllShardsInKeyspaceRequest)(nil), "vtctldata.FindAllShardsInKeyspaceRequest")
 	proto.RegisterType((*FindAllShardsInKeyspaceResponse)(nil), "vtctldata.FindAllShardsInKeyspaceResponse")
@@ -611,45 +723,54 @@ func init() {
 func init() { proto.RegisterFile("vtctldata.proto", fileDescriptor_f41247b323a1ab2e) }
 
 var fileDescriptor_f41247b323a1ab2e = []byte{
-	// 629 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
-	0x14, 0xc6, 0x95, 0x76, 0x1d, 0xed, 0x29, 0x6d, 0x87, 0x07, 0x52, 0x54, 0x04, 0x94, 0xc0, 0xb6,
-	0x4a, 0x48, 0x29, 0x0c, 0x09, 0x21, 0xc4, 0xcd, 0x18, 0x1d, 0x1a, 0x13, 0xbb, 0xc8, 0x26, 0x90,
-	0xb8, 0x20, 0xf2, 0x92, 0xb3, 0x12, 0xcd, 0x8d, 0x43, 0x7c, 0xda, 0xad, 0xbc, 0x01, 0x2f, 0xc3,
-	0x23, 0xf0, 0x6c, 0x28, 0x76, 0x92, 0x66, 0x68, 0x03, 0x71, 0xe7, 0xfc, 0xce, 0xbf, 0xef, 0x7c,
-	0xb6, 0x02, 0xbd, 0x39, 0x05, 0x24, 0x42, 0x4e, 0xdc, 0x4d, 0x52, 0x49, 0x92, 0xb5, 0x4a, 0xd0,
-	0xef, 0x08, 0x39, 0x99, 0x51, 0x24, 0x4c, 0xa4, 0xdf, 0x25, 0x99, 0xc8, 0x65, 0xa6, 0xf3, 0x09,
-	0xfa, 0xe3, 0x0b, 0x0c, 0x66, 0x84, 0x1f, 0xb3, 0x92, 0x5d, 0x39, 0x9d, 0xf2, 0x38, 0xf4, 0xf0,
-	0xdb, 0x0c, 0x15, 0x31, 0x06, 0x2b, 0x3c, 0x9d, 0x28, 0xdb, 0x1a, 0xd4, 0x87, 0x2d, 0x4f, 0x9f,
-	0xd9, 0x06, 0x74, 0x79, 0x40, 0x91, 0x8c, 0x7d, 0x8a, 0xa6, 0x28, 0x67, 0x64, 0xd7, 0x06, 0xd6,
-	0xb0, 0xee, 0x75, 0x0c, 0x3d, 0x36, 0xd0, 0xd9, 0x85, 0xbb, 0x57, 0x36, 0x56, 0x89, 0x8c, 0x15,
-	0xb2, 0xc7, 0xd0, 0xc0, 0x39, 0xc6, 0x64, 0x5b, 0x03, 0x6b, 0xd8, 0xde, 0xee, 0xba, 0x85, 0xcc,
-	0x71, 0x46, 0x3d, 0x13, 0x74, 0xee, 0xc0, 0xfa, 0x3b, 0xa4, 0x03, 0x5c, 0xa8, 0x84, 0x07, 0xa8,
-	0x72, 0x59, 0xce, 0x3e, 0xdc, 0xbe, 0x8c, 0xf3, 0xa6, 0xcf, 0xa0, 0x75, 0x56, 0x40, 0xad, 0xb9,
-	0xbd, 0xbd, 0xee, 0x2e, 0xbd, 0x29, 0x0a, 0xbc, 0x65, 0x96, 0xf3, 0x14, 0x58, 0xa5, 0x55, 0xb1,
-	0x77, 0x1f, 0x9a, 0x45, 0x8a, 0x16, 0xd8, 0xf2, 0xca, 0x6f, 0x67, 0xef, 0x92, 0xa6, 0x72, 0xf6,
-	0xe8, 0x8f, 0x92, 0x6b, 0x46, 0x2f, 0xfb, 0x1c, 0x42, 0xb3, 0xa0, 0x99, 0xcf, 0x31, 0x9f, 0x16,
-	0xb3, 0xf4, 0x99, 0xb9, 0x95, 0x86, 0x35, 0xdd, 0x90, 0xb9, 0xe5, 0xe5, 0x5d, 0xd1, 0xef, 0x35,
-	0xdc, 0xdf, 0x8b, 0xe2, 0x70, 0x47, 0x88, 0xa3, 0xaf, 0x3c, 0x0d, 0xd5, 0x7e, 0xfc, 0x3f, 0x5b,
-	0xfd, 0xb2, 0xe0, 0xc1, 0xb5, 0xe5, 0xf9, 0x8a, 0x87, 0xb0, 0xaa, 0x74, 0x2c, 0xf7, 0xf6, 0x45,
-	0x65, 0xc1, 0x7f, 0xd4, 0xba, 0x26, 0x30, 0x8e, 0x29, 0x5d, 0x78, 0x79, 0x97, 0xfe, 0x01, 0xb4,
-	0x2b, 0x98, 0xad, 0x41, 0xfd, 0x0c, 0x17, 0xb9, 0xb2, 0xec, 0xc8, 0x36, 0xa1, 0x31, 0xe7, 0x62,
-	0x56, 0xec, 0xbf, 0x56, 0x99, 0xa7, 0x0b, 0x3d, 0x13, 0x7e, 0x55, 0x7b, 0x69, 0x39, 0x5f, 0xa0,
-	0xa1, 0xd9, 0xdf, 0xb6, 0x2c, 0x7d, 0xae, 0x55, 0x7c, 0xde, 0x80, 0x86, 0xd6, 0x63, 0xd7, 0xf5,
-	0x90, 0xde, 0xd2, 0xe4, 0x7c, 0x86, 0x8e, 0x3a, 0x3f, 0x2c, 0xb0, 0x8f, 0xf9, 0x89, 0xc0, 0x0f,
-	0x9c, 0x30, 0x8d, 0xb8, 0x88, 0xbe, 0xe3, 0x11, 0x12, 0x45, 0xf1, 0x44, 0xb1, 0x87, 0x70, 0x93,
-	0x78, 0x3a, 0x41, 0xf2, 0x29, 0x4b, 0xc9, 0xe7, 0xb6, 0x0d, 0xd3, 0x55, 0xec, 0x09, 0xdc, 0x52,
-	0x72, 0x96, 0x06, 0xe8, 0xe3, 0x45, 0x92, 0xa2, 0x52, 0x91, 0x8c, 0x73, 0x1d, 0x6b, 0x26, 0x30,
-	0x2e, 0x39, 0xbb, 0x07, 0x10, 0xa4, 0xc8, 0x09, 0xfd, 0x30, 0x14, 0x5a, 0x58, 0xcb, 0x6b, 0x19,
-	0xf2, 0x36, 0x14, 0xce, 0xcf, 0x1a, 0xac, 0x5f, 0x25, 0xa3, 0x0f, 0xcd, 0x73, 0x99, 0x9e, 0x9d,
-	0x0a, 0x79, 0x5e, 0xac, 0x5e, 0x7c, 0xb3, 0x2d, 0xe8, 0xe5, 0xf3, 0x2f, 0xbd, 0xaa, 0x96, 0xd7,
-	0x35, 0xb8, 0x7c, 0x8b, 0x5b, 0xd0, 0xcb, 0x77, 0x29, 0x13, 0x8d, 0x80, 0xae, 0xc1, 0x65, 0xe2,
-	0x26, 0xf4, 0x14, 0xc9, 0xc4, 0xe7, 0xa7, 0x84, 0xa9, 0x1f, 0xc8, 0x64, 0x61, 0xaf, 0x0c, 0xac,
-	0x61, 0xd3, 0xeb, 0x64, 0x78, 0x27, 0xa3, 0xbb, 0x32, 0x59, 0xb0, 0xf7, 0xd0, 0xd5, 0xae, 0xf8,
-	0x2a, 0xd7, 0x69, 0x37, 0xf4, 0xf3, 0x79, 0x54, 0xb9, 0xce, 0xeb, 0x9c, 0xf5, 0x3a, 0xba, 0xb4,
-	0xdc, 0x90, 0xc1, 0x4a, 0x80, 0x42, 0xd8, 0xab, 0xe6, 0x02, 0xb3, 0xb3, 0x31, 0xff, 0x44, 0x64,
-	0xe6, 0x2f, 0x12, 0x54, 0xf6, 0x8d, 0xc2, 0xfc, 0x8c, 0x1d, 0x67, 0xe8, 0xcd, 0xf0, 0xf3, 0xe6,
-	0x3c, 0x22, 0x54, 0xca, 0x8d, 0xe4, 0xc8, 0x9c, 0x46, 0x13, 0x39, 0x9a, 0xd3, 0x48, 0xff, 0x05,
-	0x47, 0xa5, 0x90, 0x93, 0x55, 0x0d, 0x9e, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xa9, 0x4e,
-	0xcf, 0x53, 0x05, 0x00, 0x00,
+	// 778 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x5d, 0x8f, 0xdb, 0x44,
+	0x14, 0x95, 0x93, 0x4d, 0x88, 0x6f, 0x48, 0xb2, 0x4c, 0xba, 0xaa, 0x31, 0xa2, 0x04, 0x43, 0xd3,
+	0x48, 0x48, 0x0e, 0x14, 0x09, 0x21, 0xc4, 0xcb, 0x76, 0x9b, 0xa2, 0xa5, 0x6a, 0x85, 0xa6, 0x2b,
+	0x90, 0x78, 0xc0, 0x9a, 0xb5, 0x27, 0xc1, 0xda, 0x89, 0xc7, 0xcc, 0x8c, 0xb3, 0x0d, 0xcf, 0xbc,
+	0xf0, 0x67, 0xf8, 0x09, 0xfc, 0x36, 0xe4, 0xf9, 0x70, 0xbc, 0x65, 0x97, 0x8f, 0xb7, 0x99, 0x73,
+	0xe7, 0xde, 0x7b, 0xee, 0xb9, 0x27, 0x31, 0x4c, 0x76, 0x2a, 0x55, 0x2c, 0x23, 0x8a, 0xc4, 0xa5,
+	0xe0, 0x8a, 0x23, 0xbf, 0x01, 0xc2, 0x11, 0xe3, 0x9b, 0x4a, 0xe5, 0xcc, 0x44, 0xc2, 0xb1, 0xe2,
+	0x25, 0x3f, 0xbc, 0x0c, 0x1f, 0x6c, 0x38, 0xdf, 0x30, 0xba, 0xd4, 0xb7, 0xcb, 0x6a, 0xbd, 0xcc,
+	0x2a, 0x41, 0x54, 0xce, 0x0b, 0x13, 0x8f, 0x7e, 0x80, 0x70, 0xf5, 0x9a, 0xa6, 0x95, 0xa2, 0xdf,
+	0xd7, 0x25, 0xcf, 0xf8, 0x76, 0x4b, 0x8a, 0x0c, 0xd3, 0x5f, 0x2a, 0x2a, 0x15, 0x42, 0x70, 0x44,
+	0xc4, 0x46, 0x06, 0xde, 0xac, 0xbb, 0xf0, 0xb1, 0x3e, 0xa3, 0x87, 0x30, 0x26, 0x69, 0x5d, 0x21,
+	0x51, 0xf9, 0x96, 0xf2, 0x4a, 0x05, 0x9d, 0x99, 0xb7, 0xe8, 0xe2, 0x91, 0x41, 0x2f, 0x0c, 0x18,
+	0x9d, 0xc1, 0x7b, 0xb7, 0x16, 0x96, 0x25, 0x2f, 0x24, 0x45, 0x1f, 0x43, 0x8f, 0xee, 0x68, 0xa1,
+	0x02, 0x6f, 0xe6, 0x2d, 0x86, 0x8f, 0xc7, 0xb1, 0x1b, 0x63, 0x55, 0xa3, 0xd8, 0x04, 0xa3, 0x13,
+	0x98, 0x7e, 0x43, 0xd5, 0x73, 0xba, 0x97, 0x25, 0x49, 0xa9, 0xb4, 0xb4, 0xa2, 0x73, 0xb8, 0x77,
+	0x13, 0xb6, 0x45, 0x3f, 0x03, 0xff, 0xca, 0x81, 0x9a, 0xf3, 0xf0, 0xf1, 0x34, 0x3e, 0x68, 0xe7,
+	0x12, 0xf0, 0xe1, 0x55, 0xf4, 0x29, 0xa0, 0x56, 0x29, 0x37, 0x77, 0x08, 0x03, 0xf7, 0x44, 0x13,
+	0xf4, 0x71, 0x73, 0x8f, 0x9e, 0xdd, 0xe0, 0xd4, 0xf4, 0x5e, 0xbe, 0x91, 0x72, 0x47, 0xeb, 0x43,
+	0x9d, 0xdf, 0x3a, 0x70, 0xff, 0xbc, 0xc8, 0xd5, 0xab, 0x9f, 0x89, 0xc8, 0xbe, 0x13, 0xf9, 0x96,
+	0x88, 0xfd, 0x7f, 0xe8, 0x8f, 0xee, 0x41, 0x4f, 0xd6, 0x29, 0x5a, 0x76, 0x1f, 0x9b, 0x0b, 0xc2,
+	0x10, 0x96, 0xa6, 0x46, 0x42, 0x19, 0x4d, 0x55, 0xa2, 0xc8, 0x25, 0xa3, 0x2a, 0x21, 0x2c, 0x27,
+	0x32, 0xe8, 0x6a, 0x42, 0x27, 0x71, 0x63, 0x8e, 0x0b, 0x1d, 0x3d, 0xad, 0x83, 0xf8, 0xbe, 0x4d,
+	0x5c, 0xd5, 0x79, 0xad, 0x40, 0xdd, 0x69, 0xcd, 0x45, 0x4a, 0x83, 0xa3, 0x99, 0xb7, 0x18, 0x60,
+	0x73, 0x41, 0x2f, 0xe0, 0xe4, 0x9a, 0xe4, 0x2a, 0x11, 0xb4, 0x64, 0x79, 0x4a, 0x64, 0x63, 0x83,
+	0x9e, 0x6e, 0xf2, 0x6e, 0x6c, 0x1c, 0x17, 0x3b, 0xc7, 0xc5, 0x4f, 0xad, 0xe3, 0xf0, 0xb4, 0xce,
+	0xc3, 0x36, 0xcd, 0xf9, 0xe4, 0x09, 0x04, 0x7f, 0x57, 0xc1, 0x6a, 0x3a, 0x87, 0xbe, 0xf6, 0x81,
+	0x5b, 0xe6, 0x9b, 0x2e, 0xb1, 0xd1, 0xe8, 0x25, 0x0c, 0x9c, 0xc0, 0xb5, 0x65, 0x0b, 0xb2, 0x75,
+	0xb2, 0xe9, 0x33, 0x8a, 0x5b, 0x72, 0x76, 0x34, 0x4b, 0x74, 0x90, 0xe2, 0x96, 0xd5, 0x7c, 0x0d,
+	0x0f, 0x9e, 0xe5, 0x45, 0x76, 0xca, 0x98, 0xa6, 0x25, 0xcf, 0x8b, 0xff, 0x63, 0x90, 0x3f, 0x3d,
+	0xf8, 0xe0, 0xce, 0x74, 0x3b, 0xd9, 0x4b, 0xe8, 0xeb, 0xbd, 0xb9, 0xc9, 0xbe, 0x68, 0x79, 0xe5,
+	0x5f, 0x72, 0x63, 0x13, 0x58, 0x15, 0x4a, 0xec, 0xb1, 0xad, 0x12, 0x3e, 0x87, 0x61, 0x0b, 0x46,
+	0xc7, 0xd0, 0xbd, 0xa2, 0x7b, 0xcb, 0xac, 0x3e, 0xa2, 0x39, 0xf4, 0x76, 0x84, 0x55, 0x6e, 0xfe,
+	0xe3, 0x56, 0x3f, 0x9d, 0x88, 0x4d, 0xf8, 0xab, 0xce, 0x97, 0x5e, 0xf4, 0x13, 0xf4, 0x34, 0xf6,
+	0x8f, 0x36, 0x74, 0x3a, 0x77, 0x5a, 0x3a, 0x3f, 0x74, 0xd6, 0x34, 0x7e, 0x9b, 0x1c, 0x44, 0xb6,
+	0x3d, 0x74, 0x34, 0xfa, 0xdd, 0x83, 0x40, 0xfb, 0xec, 0x05, 0x51, 0x54, 0xe4, 0x84, 0xe5, 0xbf,
+	0xd2, 0x57, 0x54, 0xa9, 0xbc, 0xd8, 0x48, 0xf4, 0x21, 0xbc, 0xad, 0x88, 0xd8, 0x50, 0xeb, 0x60,
+	0xdb, 0x77, 0x68, 0x30, 0x9d, 0x85, 0x3e, 0x81, 0x77, 0x24, 0xaf, 0x44, 0x4a, 0x13, 0xfa, 0xba,
+	0x14, 0x54, 0xca, 0x9c, 0x17, 0x96, 0xc7, 0xb1, 0x09, 0xac, 0x1a, 0x1c, 0xbd, 0x0f, 0x90, 0x0a,
+	0x4a, 0x14, 0x4d, 0xb2, 0x8c, 0x69, 0x62, 0x3e, 0xf6, 0x0d, 0xf2, 0x34, 0x63, 0xd1, 0x1f, 0x1d,
+	0x98, 0xde, 0x46, 0x23, 0x84, 0xc1, 0x35, 0x17, 0x57, 0x6b, 0xc6, 0xaf, 0xdd, 0xe8, 0xee, 0x8e,
+	0x1e, 0xc1, 0xc4, 0xf6, 0xbf, 0xe1, 0x2a, 0x1f, 0x8f, 0x0d, 0xdc, 0x78, 0xf1, 0x11, 0x4c, 0xec,
+	0x2c, 0xcd, 0x43, 0x43, 0x60, 0x6c, 0xe0, 0xe6, 0xe1, 0x1c, 0x26, 0x52, 0xf1, 0x32, 0x21, 0x6b,
+	0x45, 0x45, 0x92, 0xf2, 0x72, 0x6f, 0x7f, 0x73, 0xa3, 0x1a, 0x3e, 0xad, 0xd1, 0x33, 0x5e, 0xee,
+	0xd1, 0xb7, 0x30, 0xd6, 0xaa, 0x24, 0xd2, 0xf2, 0x0c, 0x7a, 0xda, 0x3e, 0x1f, 0xb5, 0xd6, 0x79,
+	0x97, 0xb2, 0x78, 0xa4, 0x53, 0x9b, 0x09, 0x11, 0x1c, 0xa5, 0x94, 0xb1, 0xa0, 0x6f, 0x16, 0x58,
+	0x9f, 0x8d, 0xf8, 0xfa, 0x7f, 0x43, 0xed, 0x4b, 0x2a, 0x83, 0xb7, 0x9c, 0xf8, 0x35, 0x76, 0x51,
+	0x43, 0x4f, 0x16, 0x3f, 0xce, 0x77, 0xb9, 0xa2, 0x52, 0xc6, 0x39, 0x5f, 0x9a, 0xd3, 0x72, 0xc3,
+	0x97, 0x3b, 0x65, 0x3e, 0x31, 0xcb, 0x86, 0xc8, 0x65, 0x5f, 0x03, 0x9f, 0xff, 0x15, 0x00, 0x00,
+	0xff, 0xff, 0x0a, 0x35, 0x2b, 0x50, 0xbe, 0x06, 0x00, 0x00,
 }
diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go
index 3f7e5a349cb..4ff9e86487e 100644
--- a/go/vt/proto/vtctlservice/vtctlservice.pb.go
+++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	vtctldata "vitess.io/vitess/go/vt/proto/vtctldata"
 )
 
@@ -30,22 +29,24 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 func init() { proto.RegisterFile("vtctlservice.proto", fileDescriptor_27055cdbb1148d2b) }
 
 var fileDescriptor_27055cdbb1148d2b = []byte{
-	// 235 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x2b, 0x49, 0x2e,
-	0xc9, 0x29, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2,
-	0x41, 0x16, 0x93, 0xe2, 0x07, 0xf3, 0x52, 0x12, 0x4b, 0x12, 0x21, 0xd2, 0x46, 0x85, 0x5c, 0xac,
-	0x61, 0x20, 0x21, 0xa1, 0x0c, 0x2e, 0x61, 0xd7, 0x8a, 0xd4, 0xe4, 0xd2, 0x92, 0x54, 0x30, 0xdf,
-	0x39, 0x3f, 0x37, 0x37, 0x31, 0x2f, 0x45, 0x48, 0x55, 0x0f, 0xa1, 0x03, 0x8b, 0x7c, 0x50, 0x6a,
-	0x61, 0x69, 0x6a, 0x71, 0x89, 0x94, 0x1a, 0x21, 0x65, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x4a,
-	0x0c, 0x06, 0x8c, 0x46, 0xf3, 0x99, 0xb8, 0xd8, 0xc0, 0x92, 0x29, 0x42, 0x45, 0x5c, 0xe2, 0x6e,
-	0x99, 0x79, 0x29, 0x8e, 0x39, 0x39, 0xc1, 0x19, 0x89, 0x45, 0x29, 0xc5, 0x9e, 0x79, 0xde, 0xa9,
-	0x95, 0xc5, 0x05, 0x89, 0xc9, 0xa9, 0x42, 0x9a, 0x48, 0x26, 0xe2, 0x50, 0x03, 0xb3, 0x5c, 0x8b,
-	0x18, 0xa5, 0x30, 0x07, 0x08, 0xf9, 0x71, 0x71, 0xbb, 0xa7, 0x96, 0xc0, 0xed, 0x91, 0x45, 0xd2,
-	0x8c, 0x24, 0x0e, 0x33, 0x5b, 0x0e, 0x97, 0x34, 0xdc, 0xbc, 0x40, 0x2e, 0x1e, 0x24, 0x89, 0x62,
-	0x21, 0x1c, 0x3a, 0x8a, 0x61, 0x26, 0xca, 0xe3, 0x94, 0x87, 0x19, 0xe9, 0xa4, 0x1d, 0xa5, 0x59,
-	0x96, 0x59, 0x92, 0x5a, 0x5c, 0xac, 0x97, 0x99, 0xaf, 0x0f, 0x61, 0xe9, 0xa7, 0xe7, 0xeb, 0x97,
-	0x95, 0xe8, 0x83, 0x23, 0x4d, 0x1f, 0x39, 0x4a, 0x93, 0xd8, 0xc0, 0x62, 0xc6, 0x80, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xd5, 0x49, 0x16, 0xd1, 0xfd, 0x01, 0x00, 0x00,
+	// 263 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x4b, 0xc3, 0x30,
+	0x10, 0xc7, 0x55, 0x70, 0x0f, 0x71, 0xa0, 0x9c, 0x0f, 0xc2, 0x40, 0x85, 0x89, 0xc2, 0x14, 0x1a,
+	0x99, 0x7f, 0x81, 0x8a, 0xca, 0x10, 0xc4, 0x1f, 0xe0, 0x83, 0xe0, 0x43, 0x6c, 0x0e, 0x17, 0x68,
+	0x93, 0x2e, 0x77, 0x2b, 0xee, 0x9f, 0x17, 0x31, 0x25, 0x35, 0x88, 0x55, 0xdf, 0x7a, 0xdf, 0x1f,
+	0x9f, 0x6b, 0xe0, 0x04, 0xd4, 0x9c, 0x73, 0x41, 0xe8, 0x6b, 0x93, 0x63, 0x56, 0x79, 0xc7, 0x0e,
+	0xfa, 0xa9, 0x36, 0x58, 0x0f, 0x93, 0x56, 0xac, 0x1a, 0x7b, 0x3c, 0x13, 0xab, 0x8f, 0x9f, 0x12,
+	0x4c, 0xc5, 0xe6, 0xc5, 0x1b, 0xe6, 0x73, 0xc6, 0x30, 0x9f, 0xbb, 0xb2, 0x54, 0x56, 0xc3, 0x7e,
+	0xf6, 0xd5, 0xf8, 0xc1, 0xbf, 0xc7, 0xd9, 0x1c, 0x89, 0x07, 0x07, 0x7f, 0xc5, 0xa8, 0x72, 0x96,
+	0x70, 0xb8, 0x74, 0xbc, 0x3c, 0x7e, 0x5f, 0x11, 0xbd, 0x60, 0x6a, 0xf0, 0x62, 0xeb, 0xd2, 0x58,
+	0x7d, 0x5a, 0x14, 0x0f, 0x53, 0xe5, 0x35, 0x4d, 0xec, 0x35, 0x2e, 0xa8, 0x52, 0x39, 0xc2, 0x28,
+	0x21, 0x76, 0x64, 0xe2, 0xf2, 0xc3, 0xff, 0x44, 0xe3, 0x0f, 0xc0, 0x8d, 0x58, 0xbb, 0x42, 0x6e,
+	0xf7, 0x6c, 0x27, 0xe5, 0x44, 0x8f, 0xec, 0x9d, 0x2e, 0xbb, 0xe5, 0xdd, 0x89, 0x7e, 0x62, 0x10,
+	0x74, 0x34, 0x28, 0x12, 0x77, 0x3b, 0xfd, 0x16, 0xf9, 0x2c, 0x36, 0x26, 0xd6, 0x70, 0x78, 0xc4,
+	0xad, 0x37, 0xa5, 0xf2, 0x0b, 0x18, 0x26, 0xb5, 0xef, 0x66, 0x44, 0xef, 0xfd, 0x9a, 0x89, 0xf8,
+	0xb3, 0xa3, 0xa7, 0x51, 0x6d, 0x18, 0x89, 0x32, 0xe3, 0x64, 0xf3, 0x25, 0x5f, 0x9d, 0xac, 0x59,
+	0x86, 0x9b, 0x90, 0xe9, 0xc5, 0xbc, 0xf4, 0x82, 0x76, 0xf2, 0x11, 0x00, 0x00, 0xff, 0xff, 0xae,
+	0x74, 0xb6, 0x52, 0x5c, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -165,6 +166,13 @@ type VtctldClient interface {
 	GetKeyspace(ctx context.Context, in *vtctldata.GetKeyspaceRequest, opts ...grpc.CallOption) (*vtctldata.GetKeyspaceResponse, error)
 	// GetKeyspaces returns the keyspace struct of all keyspaces in the topo.
 	GetKeyspaces(ctx context.Context, in *vtctldata.GetKeyspacesRequest, opts ...grpc.CallOption) (*vtctldata.GetKeyspacesResponse, error)
+	// InitShardPrimary sets the initial primary for a shard. Will make all other
+	// tablets in the shard replicas of the provided primary.
+	//
+	// WARNING: This could cause data loss on an already replicating shard.
+	// PlannedReparentShard or EmergencyReparentShard should be used in those
+	// cases instead.
+	InitShardPrimary(ctx context.Context, in *vtctldata.InitShardPrimaryRequest, opts ...grpc.CallOption) (*vtctldata.InitShardPrimaryResponse, error)
 }
 
 type vtctldClient struct {
@@ -202,6 +210,15 @@ func (c *vtctldClient) GetKeyspaces(ctx context.Context, in *vtctldata.GetKeyspa
 	return out, nil
 }
 
+func (c *vtctldClient) InitShardPrimary(ctx context.Context, in *vtctldata.InitShardPrimaryRequest, opts ...grpc.CallOption) (*vtctldata.InitShardPrimaryResponse, error) {
+	out := new(vtctldata.InitShardPrimaryResponse)
+	err := c.cc.Invoke(ctx, "/vtctlservice.Vtctld/InitShardPrimary", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // VtctldServer is the server API for Vtctld service.
 type VtctldServer interface {
 	// FindAllShardsInKeyspace returns a map of shard names to shard references for a given keyspace.
@@ -210,6 +227,13 @@ type VtctldServer interface {
 	GetKeyspace(context.Context, *vtctldata.GetKeyspaceRequest) (*vtctldata.GetKeyspaceResponse, error)
 	// GetKeyspaces returns the keyspace struct of all keyspaces in the topo.
 	GetKeyspaces(context.Context, *vtctldata.GetKeyspacesRequest) (*vtctldata.GetKeyspacesResponse, error)
+	// InitShardPrimary sets the initial primary for a shard. Will make all other
+	// tablets in the shard replicas of the provided primary.
+	//
+	// WARNING: This could cause data loss on an already replicating shard.
+	// PlannedReparentShard or EmergencyReparentShard should be used in those
+	// cases instead.
+	InitShardPrimary(context.Context, *vtctldata.InitShardPrimaryRequest) (*vtctldata.InitShardPrimaryResponse, error)
 }
 
 // UnimplementedVtctldServer can be embedded to have forward compatible implementations.
@@ -225,6 +249,9 @@ func (*UnimplementedVtctldServer) GetKeyspace(ctx context.Context, req *vtctldat
 func (*UnimplementedVtctldServer) GetKeyspaces(ctx context.Context, req *vtctldata.GetKeyspacesRequest) (*vtctldata.GetKeyspacesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetKeyspaces not implemented")
 }
+func (*UnimplementedVtctldServer) InitShardPrimary(ctx context.Context, req *vtctldata.InitShardPrimaryRequest) (*vtctldata.InitShardPrimaryResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method InitShardPrimary not implemented")
+}
 
 func RegisterVtctldServer(s *grpc.Server, srv VtctldServer) {
 	s.RegisterService(&_Vtctld_serviceDesc, srv)
@@ -284,6 +311,24 @@ func _Vtctld_GetKeyspaces_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Vtctld_InitShardPrimary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(vtctldata.InitShardPrimaryRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VtctldServer).InitShardPrimary(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/vtctlservice.Vtctld/InitShardPrimary",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VtctldServer).InitShardPrimary(ctx, req.(*vtctldata.InitShardPrimaryRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Vtctld_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "vtctlservice.Vtctld",
 	HandlerType: (*VtctldServer)(nil),
@@ -300,6 +345,10 @@ var _Vtctld_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetKeyspaces",
 			Handler:    _Vtctld_GetKeyspaces_Handler,
 		},
+		{
+			MethodName: "InitShardPrimary",
+			Handler:    _Vtctld_InitShardPrimary_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "vtctlservice.proto",
diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go
index 199d82cd0f6..e5deffdfd18 100644
--- a/go/vt/proto/vtgate/vtgate.pb.go
+++ b/go/vt/proto/vtgate/vtgate.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	binlogdata "vitess.io/vitess/go/vt/proto/binlogdata"
 	query "vitess.io/vitess/go/vt/proto/query"
 	topodata "vitess.io/vitess/go/vt/proto/topodata"
diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go
index 023adc5d727..47083723c94 100644
--- a/go/vt/proto/vtgateservice/vtgateservice.pb.go
+++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	vtgate "vitess.io/vitess/go/vt/proto/vtgate"
 )
 
diff --git a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
index ac3389283aa..986447754bc 100644
--- a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
+++ b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go
@@ -8,7 +8,6 @@ import (
 	math "math"
 
 	proto "github.com/golang/protobuf/proto"
-
 	logutil "vitess.io/vitess/go/vt/proto/logutil"
 )
 
diff --git a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
index 66b4c5acb7b..22a1a03e8aa 100644
--- a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
+++ b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go
@@ -12,7 +12,6 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-
 	vtworkerdata "vitess.io/vitess/go/vt/proto/vtworkerdata"
 )
 
diff --git a/go/vt/vtctl/grpcvtctldclient/client_gen.go b/go/vt/vtctl/grpcvtctldclient/client_gen.go
index cbe87b15d87..42d47095e0d 100644
--- a/go/vt/vtctl/grpcvtctldclient/client_gen.go
+++ b/go/vt/vtctl/grpcvtctldclient/client_gen.go
@@ -54,3 +54,12 @@ func (client *gRPCVtctldClient) GetKeyspaces(ctx context.Context, in *vtctldatap
 
 	return client.c.GetKeyspaces(ctx, in, opts...)
 }
+
+// InitShardPrimary is part of the vtctlservicepb.VtctldClient interface.
+func (client *gRPCVtctldClient) InitShardPrimary(ctx context.Context, in *vtctldatapb.InitShardPrimaryRequest, opts ...grpc.CallOption) (*vtctldatapb.InitShardPrimaryResponse, error) {
+	if client.c == nil {
+		return nil, status.Error(codes.Unavailable, connClosedMsg)
+	}
+
+	return client.c.InitShardPrimary(ctx, in, opts...)
+}
diff --git a/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go b/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go
new file mode 100644
index 00000000000..1b685104a7e
--- /dev/null
+++ b/go/vt/vtctl/grpcvtctldserver/endtoend/init_shard_primary_test.go
@@ -0,0 +1,162 @@
+/*
+Copyright 2020 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package endtoend
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"vitess.io/vitess/go/mysql/fakesqldb"
+	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/vt/logutil"
+	"vitess.io/vitess/go/vt/topo/memorytopo"
+	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver"
+	"vitess.io/vitess/go/vt/vttablet/tabletservermock"
+	"vitess.io/vitess/go/vt/vttablet/tmclient"
+	"vitess.io/vitess/go/vt/wrangler"
+	"vitess.io/vitess/go/vt/wrangler/testlib"
+
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+)
+
+func TestInitShardPrimary(t *testing.T) {
+	ts := memorytopo.NewServer("cell1")
+	tmc := tmclient.NewTabletManagerClient()
+	wr := wrangler.New(logutil.NewConsoleLogger(), ts, tmc)
+
+	primaryDb := fakesqldb.New(t)
+	primaryDb.AddQuery("create database if not exists `vt_test_keyspace`", &sqltypes.Result{InsertID: 0, RowsAffected: 0})
+
+	tablet1 := testlib.NewFakeTablet(t, wr, "cell1", 0, topodatapb.TabletType_MASTER, primaryDb)
+	tablet2 := testlib.NewFakeTablet(t, wr, "cell1", 1, topodatapb.TabletType_REPLICA, nil)
+	tablet3 := testlib.NewFakeTablet(t, wr, "cell1", 2, topodatapb.TabletType_REPLICA, nil)
+
+	tablet1.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"CREATE DATABASE IF NOT EXISTS _vt",
+		"SUBCREATE TABLE IF NOT EXISTS _vt.reparent_journal",
+		"CREATE DATABASE IF NOT EXISTS _vt",
+		"SUBCREATE TABLE IF NOT EXISTS _vt.reparent_journal",
+		"SUBINSERT INTO _vt.reparent_journal (time_created_ns, action_name, master_alias, replication_position) VALUES",
+	}
+
+	tablet2.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"FAKE RESET ALL REPLICATION",
+		"FAKE SET SLAVE POSITION",
+		"FAKE SET MASTER",
+		"START SLAVE",
+	}
+	tablet2.FakeMysqlDaemon.SetMasterInput = fmt.Sprintf("%v:%v", tablet1.Tablet.Hostname, tablet1.Tablet.MysqlPort)
+
+	tablet3.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"FAKE RESET ALL REPLICATION",
+		"FAKE SET SLAVE POSITION",
+		"FAKE SET MASTER",
+		"START SLAVE",
+	}
+	tablet3.FakeMysqlDaemon.SetMasterInput = fmt.Sprintf("%v:%v", tablet1.Tablet.Hostname, tablet1.Tablet.MysqlPort)
+
+	for _, tablet := range []*testlib.FakeTablet{tablet1, tablet2, tablet3} {
+		tablet.StartActionLoop(t, wr)
+		defer tablet.StopActionLoop(t)
+
+		tablet.TM.QueryServiceControl.(*tabletservermock.Controller).SetQueryServiceEnabledForTests(true)
+	}
+
+	vtctld := grpcvtctldserver.NewVtctldServer(ts)
+	resp, err := vtctld.InitShardPrimary(context.Background(), &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                tablet1.Tablet.Keyspace,
+		Shard:                   tablet1.Tablet.Shard,
+		PrimaryElectTabletAlias: tablet1.Tablet.Alias,
+	})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, resp)
+}
+
+func TestInitShardPrimaryNoFormerPrimary(t *testing.T) {
+	ts := memorytopo.NewServer("cell1")
+	tmc := tmclient.NewTabletManagerClient()
+	wr := wrangler.New(logutil.NewConsoleLogger(), ts, tmc)
+
+	primaryDb := fakesqldb.New(t)
+	primaryDb.AddQuery("create database if not exists `vt_test_keyspace`", &sqltypes.Result{InsertID: 0, RowsAffected: 0})
+
+	tablet1 := testlib.NewFakeTablet(t, wr, "cell1", 0, topodatapb.TabletType_REPLICA, primaryDb)
+	tablet2 := testlib.NewFakeTablet(t, wr, "cell1", 1, topodatapb.TabletType_REPLICA, nil)
+	tablet3 := testlib.NewFakeTablet(t, wr, "cell1", 2, topodatapb.TabletType_REPLICA, nil)
+
+	tablet1.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"CREATE DATABASE IF NOT EXISTS _vt",
+		"SUBCREATE TABLE IF NOT EXISTS _vt.reparent_journal",
+		"CREATE DATABASE IF NOT EXISTS _vt",
+		"SUBCREATE TABLE IF NOT EXISTS _vt.reparent_journal",
+		"SUBINSERT INTO _vt.reparent_journal (time_created_ns, action_name, master_alias, replication_position) VALUES",
+	}
+
+	tablet2.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"FAKE SET SLAVE POSITION",
+		"FAKE SET MASTER",
+		"START SLAVE",
+	}
+	tablet2.FakeMysqlDaemon.SetMasterInput = fmt.Sprintf("%v:%v", tablet1.Tablet.Hostname, tablet1.Tablet.MysqlPort)
+
+	tablet3.FakeMysqlDaemon.ExpectedExecuteSuperQueryList = []string{
+		"FAKE RESET ALL REPLICATION",
+		"FAKE SET SLAVE POSITION",
+		"FAKE SET MASTER",
+		"START SLAVE",
+	}
+	tablet3.FakeMysqlDaemon.SetMasterInput = fmt.Sprintf("%v:%v", tablet1.Tablet.Hostname, tablet1.Tablet.MysqlPort)
+
+	for _, tablet := range []*testlib.FakeTablet{tablet1, tablet2, tablet3} {
+		tablet.StartActionLoop(t, wr)
+		defer tablet.StopActionLoop(t)
+
+		tablet.TM.QueryServiceControl.(*tabletservermock.Controller).SetQueryServiceEnabledForTests(true)
+	}
+
+	vtctld := grpcvtctldserver.NewVtctldServer(ts)
+	_, err := vtctld.InitShardPrimary(context.Background(), &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                tablet1.Tablet.Keyspace,
+		Shard:                   tablet1.Tablet.Shard,
+		PrimaryElectTabletAlias: tablet1.Tablet.Alias,
+	})
+
+	assert.Error(t, err)
+
+	resp, err := vtctld.InitShardPrimary(context.Background(), &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                tablet1.Tablet.Keyspace,
+		Shard:                   tablet1.Tablet.Shard,
+		PrimaryElectTabletAlias: tablet1.Tablet.Alias,
+		Force:                   true,
+	})
+	assert.NoError(t, err)
+	assert.NotNil(t, resp)
+	tablet1PostInit, err := ts.GetTablet(context.Background(), tablet1.Tablet.Alias)
+	require.NoError(t, err)
+	assert.Equal(t, topodatapb.TabletType_MASTER, tablet1PostInit.Type)
+}
diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
index 4af7816e859..db0ee1c40a3 100644
--- a/go/vt/vtctl/grpcvtctldserver/server.go
+++ b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -18,13 +18,33 @@ package grpcvtctldserver
 
 import (
 	"context"
+	"fmt"
+	"sync"
+	"time"
 
+	"github.com/golang/protobuf/ptypes"
 	"google.golang.org/grpc"
 
+	"vitess.io/vitess/go/event"
+	"vitess.io/vitess/go/sqlescape"
+	"vitess.io/vitess/go/vt/concurrency"
+	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/topo"
+	"vitess.io/vitess/go/vt/topo/topoproto"
+	"vitess.io/vitess/go/vt/topotools"
+	"vitess.io/vitess/go/vt/topotools/events"
+	"vitess.io/vitess/go/vt/vterrors"
+	"vitess.io/vitess/go/vt/vttablet/tmclient"
 
+	logutilpb "vitess.io/vitess/go/vt/proto/logutil"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
 	vtctlservicepb "vitess.io/vitess/go/vt/proto/vtctlservice"
+	"vitess.io/vitess/go/vt/proto/vtrpc"
+)
+
+const (
+	initShardMasterOperation = "InitShardMaster" // (TODO:@amason) Can I rename this to Primary?
 )
 
 // VtctldServer implements the Vtctld RPC service protocol.
@@ -94,6 +114,252 @@ func (s *VtctldServer) GetKeyspaces(ctx context.Context, req *vtctldatapb.GetKey
 	return &vtctldatapb.GetKeyspacesResponse{Keyspaces: keyspaces}, nil
 }
 
+// InitShardPrimary is part of the vtctlservicepb.VtctldServer interface.
+func (s *VtctldServer) InitShardPrimary(ctx context.Context, req *vtctldatapb.InitShardPrimaryRequest) (*vtctldatapb.InitShardPrimaryResponse, error) {
+	if req.Keyspace == "" {
+		return nil, vterrors.Errorf(vtrpc.Code_INVALID_ARGUMENT, "keyspace field is required")
+	}
+
+	if req.Shard == "" {
+		return nil, vterrors.Errorf(vtrpc.Code_INVALID_ARGUMENT, "shard field is required")
+	}
+
+	var waitReplicasTimeout time.Duration
+	if req.WaitReplicasTimeout != nil {
+		wrt, err := ptypes.Duration(req.WaitReplicasTimeout)
+		if err != nil {
+			return nil, vterrors.Errorf(vtrpc.Code_INVALID_ARGUMENT, "cannot parse WaitReplicasTimeout; err = %v", err)
+		}
+
+		waitReplicasTimeout = wrt
+	} else {
+		waitReplicasTimeout = time.Second * 30
+	}
+
+	ctx, unlock, err := s.ts.LockShard(ctx, req.Keyspace, req.Shard, fmt.Sprintf("InitShardPrimary(%v)", topoproto.TabletAliasString(req.PrimaryElectTabletAlias)))
+	if err != nil {
+		return nil, err
+	}
+	defer unlock(&err)
+
+	ev := &events.Reparent{}
+
+	resp := &vtctldatapb.InitShardPrimaryResponse{}
+	err = s.InitShardPrimaryLocked(ctx, ev, req, waitReplicasTimeout, tmclient.NewTabletManagerClient(), logutil.NewCallbackLogger(func(e *logutilpb.Event) {
+		resp.Events = append(resp.Events, e)
+	}))
+	if err != nil {
+		event.DispatchUpdate(ev, "failed InitShardPrimary: "+err.Error())
+	} else {
+		event.DispatchUpdate(ev, "finished InitShardPrimary")
+	}
+
+	return resp, err
+}
+
+// InitShardPrimaryLocked is the main work of doing an InitShardPrimary. It
+// should only called by callers that have already locked the shard in the topo.
+// It is only public so that it can be used in wrangler and legacy vtctl server.
+func (s *VtctldServer) InitShardPrimaryLocked(
+	ctx context.Context,
+	ev *events.Reparent,
+	req *vtctldatapb.InitShardPrimaryRequest,
+	waitReplicasTimeout time.Duration,
+	tmc tmclient.TabletManagerClient,
+	logger logutil.Logger,
+) error {
+	// (TODO:@amason) The code below this point is a verbatim copy of
+	// initShardMasterLocked in package wrangler, modulo the following:
+	// - s/keyspace/req.Keyspace
+	// - s/shard/req.Shard
+	// - s/masterElectTabletAlias/req.PrimaryElectTabletAlias
+	// - s/wr.logger/logger
+	// - s/wr.tmc/tmc
+	// - s/wr.ts/s.ts
+	//
+	// It is also sufficiently complex and critical code that I feel it's unwise
+	// to port and refactor in one change; so, this comment serves both as an
+	// acknowledgement of that, as well as a TODO marker for us to revisit this.
+	shardInfo, err := s.ts.GetShard(ctx, req.Keyspace, req.Shard)
+	if err != nil {
+		return err
+	}
+	ev.ShardInfo = *shardInfo
+
+	event.DispatchUpdate(ev, "reading tablet map")
+	tabletMap, err := s.ts.GetTabletMapForShard(ctx, req.Keyspace, req.Shard)
+	if err != nil {
+		return err
+	}
+
+	// Check the master elect is in tabletMap.
+	masterElectTabletAliasStr := topoproto.TabletAliasString(req.PrimaryElectTabletAlias)
+	masterElectTabletInfo, ok := tabletMap[masterElectTabletAliasStr]
+	if !ok {
+		return fmt.Errorf("master-elect tablet %v is not in the shard", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+	}
+	ev.NewMaster = *masterElectTabletInfo.Tablet
+
+	// Check the master is the only master is the shard, or -force was used.
+	_, masterTabletMap := topotools.SortedTabletMap(tabletMap)
+	if !topoproto.TabletAliasEqual(shardInfo.MasterAlias, req.PrimaryElectTabletAlias) {
+		if !req.Force {
+			return fmt.Errorf("master-elect tablet %v is not the shard master, use -force to proceed anyway", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+		}
+
+		logger.Warningf("master-elect tablet %v is not the shard master, proceeding anyway as -force was used", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+	}
+	if _, ok := masterTabletMap[masterElectTabletAliasStr]; !ok {
+		if !req.Force {
+			return fmt.Errorf("master-elect tablet %v is not a master in the shard, use -force to proceed anyway", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+		}
+		logger.Warningf("master-elect tablet %v is not a master in the shard, proceeding anyway as -force was used", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+	}
+	haveOtherMaster := false
+	for alias := range masterTabletMap {
+		if masterElectTabletAliasStr != alias {
+			haveOtherMaster = true
+		}
+	}
+	if haveOtherMaster {
+		if !req.Force {
+			return fmt.Errorf("master-elect tablet %v is not the only master in the shard, use -force to proceed anyway", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+		}
+		logger.Warningf("master-elect tablet %v is not the only master in the shard, proceeding anyway as -force was used", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+	}
+
+	// First phase: reset replication on all tablets. If anyone fails,
+	// we stop. It is probably because it is unreachable, and may leave
+	// an unstable database process in the mix, with a database daemon
+	// at a wrong replication spot.
+
+	// Create a context for the following RPCs that respects waitReplicasTimeout
+	resetCtx, resetCancel := context.WithTimeout(ctx, waitReplicasTimeout)
+	defer resetCancel()
+
+	event.DispatchUpdate(ev, "resetting replication on all tablets")
+	wg := sync.WaitGroup{}
+	rec := concurrency.AllErrorRecorder{}
+	for alias, tabletInfo := range tabletMap {
+		wg.Add(1)
+		go func(alias string, tabletInfo *topo.TabletInfo) {
+			defer wg.Done()
+			logger.Infof("resetting replication on tablet %v", alias)
+			if err := tmc.ResetReplication(resetCtx, tabletInfo.Tablet); err != nil {
+				rec.RecordError(fmt.Errorf("tablet %v ResetReplication failed (either fix it, or Scrap it): %v", alias, err))
+			}
+		}(alias, tabletInfo)
+	}
+	wg.Wait()
+	if err := rec.Error(); err != nil {
+		// if any of the replicas failed
+		return err
+	}
+
+	// Check we still have the topology lock.
+	if err := topo.CheckShardLocked(ctx, req.Keyspace, req.Shard); err != nil {
+		return fmt.Errorf("lost topology lock, aborting: %v", err)
+	}
+
+	// Tell the new master to break its replicas, return its replication
+	// position
+	logger.Infof("initializing master on %v", topoproto.TabletAliasString(req.PrimaryElectTabletAlias))
+	event.DispatchUpdate(ev, "initializing master")
+	rp, err := tmc.InitMaster(ctx, masterElectTabletInfo.Tablet)
+	if err != nil {
+		return err
+	}
+
+	// Check we stil have the topology lock.
+	if err := topo.CheckShardLocked(ctx, req.Keyspace, req.Shard); err != nil {
+		return fmt.Errorf("lost topology lock, aborting: %v", err)
+	}
+
+	// Create a cancelable context for the following RPCs.
+	// If error conditions happen, we can cancel all outgoing RPCs.
+	replCtx, replCancel := context.WithTimeout(ctx, waitReplicasTimeout)
+	defer replCancel()
+
+	// Now tell the new master to insert the reparent_journal row,
+	// and tell everybody else to become a replica of the new master,
+	// and wait for the row in the reparent_journal table.
+	// We start all these in parallel, to handle the semi-sync
+	// case: for the master to be able to commit its row in the
+	// reparent_journal table, it needs connected replicas.
+	event.DispatchUpdate(ev, "reparenting all tablets")
+	now := time.Now().UnixNano()
+	wgMaster := sync.WaitGroup{}
+	wgReplicas := sync.WaitGroup{}
+	var masterErr error
+	for alias, tabletInfo := range tabletMap {
+		if alias == masterElectTabletAliasStr {
+			wgMaster.Add(1)
+			go func(alias string, tabletInfo *topo.TabletInfo) {
+				defer wgMaster.Done()
+				logger.Infof("populating reparent journal on new master %v", alias)
+				masterErr = tmc.PopulateReparentJournal(replCtx, tabletInfo.Tablet, now,
+					initShardMasterOperation,
+					req.PrimaryElectTabletAlias, rp)
+			}(alias, tabletInfo)
+		} else {
+			wgReplicas.Add(1)
+			go func(alias string, tabletInfo *topo.TabletInfo) {
+				defer wgReplicas.Done()
+				logger.Infof("initializing replica %v", alias)
+				if err := tmc.InitReplica(replCtx, tabletInfo.Tablet, req.PrimaryElectTabletAlias, rp, now); err != nil {
+					rec.RecordError(fmt.Errorf("tablet %v InitReplica failed: %v", alias, err))
+				}
+			}(alias, tabletInfo)
+		}
+	}
+
+	// After the master is done, we can update the shard record
+	// (note with semi-sync, it also means at least one replica is done).
+	wgMaster.Wait()
+	if masterErr != nil {
+		// The master failed, there is no way the
+		// replicas will work.  So we cancel them all.
+		logger.Warningf("master failed to PopulateReparentJournal, canceling replicas")
+		replCancel()
+		wgReplicas.Wait()
+		return fmt.Errorf("failed to PopulateReparentJournal on master: %v", masterErr)
+	}
+	if !topoproto.TabletAliasEqual(shardInfo.MasterAlias, req.PrimaryElectTabletAlias) {
+		if _, err := s.ts.UpdateShardFields(ctx, req.Keyspace, req.Shard, func(si *topo.ShardInfo) error {
+			si.MasterAlias = req.PrimaryElectTabletAlias
+			return nil
+		}); err != nil {
+			wgReplicas.Wait()
+			return fmt.Errorf("failed to update shard master record: %v", err)
+		}
+	}
+
+	// Wait for the replicas to complete. If some of them fail, we
+	// don't want to rebuild the shard serving graph (the failure
+	// will most likely be a timeout, and our context will be
+	// expired, so the rebuild will fail anyway)
+	wgReplicas.Wait()
+	if err := rec.Error(); err != nil {
+		return err
+	}
+
+	// Create database if necessary on the master. replicas will get it too through
+	// replication. Since the user called InitShardMaster, they've told us to
+	// assume that whatever data is on all the replicas is what they intended.
+	// If the database doesn't exist, it means the user intends for these tablets
+	// to begin serving with no data (i.e. first time initialization).
+	createDB := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", sqlescape.EscapeID(topoproto.TabletDbName(masterElectTabletInfo.Tablet)))
+	if _, err := tmc.ExecuteFetchAsDba(ctx, masterElectTabletInfo.Tablet, false, []byte(createDB), 1, false, true); err != nil {
+		return fmt.Errorf("failed to create database: %v", err)
+	}
+	// Refresh the state to force the tabletserver to reconnect after db has been created.
+	if err := tmc.RefreshState(ctx, masterElectTabletInfo.Tablet); err != nil {
+		log.Warningf("RefreshState failed: %v", err)
+	}
+
+	return nil
+}
+
 // StartServer registers a VtctldServer for RPCs on the given gRPC server.
 func StartServer(s *grpc.Server, ts *topo.Server) {
 	vtctlservicepb.RegisterVtctldServer(s, NewVtctldServer(ts))
diff --git a/go/vt/wrangler/reparent.go b/go/vt/wrangler/reparent.go
index e9dc22a0eb5..0e781ddc00e 100644
--- a/go/vt/wrangler/reparent.go
+++ b/go/vt/wrangler/reparent.go
@@ -31,22 +31,22 @@ import (
 
 	"vitess.io/vitess/go/event"
 	"vitess.io/vitess/go/mysql"
-	"vitess.io/vitess/go/sqlescape"
 	"vitess.io/vitess/go/vt/concurrency"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/topotools"
 	"vitess.io/vitess/go/vt/topotools/events"
+	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver"
 	"vitess.io/vitess/go/vt/vterrors"
 
 	replicationdatapb "vitess.io/vitess/go/vt/proto/replicationdata"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
 	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 )
 
 const (
-	initShardMasterOperation            = "InitShardMaster"
 	plannedReparentShardOperation       = "PlannedReparentShard"
 	emergencyReparentShardOperation     = "EmergencyReparentShard"
 	tabletExternallyReparentedOperation = "TabletExternallyReparented" //nolint
@@ -149,7 +149,12 @@ func (wr *Wrangler) InitShardMaster(ctx context.Context, keyspace, shard string,
 	ev := &events.Reparent{}
 
 	// do the work
-	err = wr.initShardMasterLocked(ctx, ev, keyspace, shard, masterElectTabletAlias, force, waitReplicasTimeout)
+	err = grpcvtctldserver.NewVtctldServer(wr.ts).InitShardPrimaryLocked(ctx, ev, &vtctldatapb.InitShardPrimaryRequest{
+		Keyspace:                keyspace,
+		Shard:                   shard,
+		PrimaryElectTabletAlias: masterElectTabletAlias,
+		Force:                   force,
+	}, waitReplicasTimeout, wr.tmc, wr.logger)
 	if err != nil {
 		event.DispatchUpdate(ev, "failed InitShardMaster: "+err.Error())
 	} else {
@@ -158,184 +163,6 @@ func (wr *Wrangler) InitShardMaster(ctx context.Context, keyspace, shard string,
 	return err
 }
 
-func (wr *Wrangler) initShardMasterLocked(ctx context.Context, ev *events.Reparent, keyspace, shard string, masterElectTabletAlias *topodatapb.TabletAlias, force bool, waitReplicasTimeout time.Duration) error {
-	shardInfo, err := wr.ts.GetShard(ctx, keyspace, shard)
-	if err != nil {
-		return err
-	}
-	ev.ShardInfo = *shardInfo
-
-	event.DispatchUpdate(ev, "reading tablet map")
-	tabletMap, err := wr.ts.GetTabletMapForShard(ctx, keyspace, shard)
-	if err != nil {
-		return err
-	}
-
-	// Check the master elect is in tabletMap.
-	masterElectTabletAliasStr := topoproto.TabletAliasString(masterElectTabletAlias)
-	masterElectTabletInfo, ok := tabletMap[masterElectTabletAliasStr]
-	if !ok {
-		return fmt.Errorf("master-elect tablet %v is not in the shard", topoproto.TabletAliasString(masterElectTabletAlias))
-	}
-	ev.NewMaster = *masterElectTabletInfo.Tablet
-
-	// Check the master is the only master is the shard, or -force was used.
-	_, masterTabletMap := topotools.SortedTabletMap(tabletMap)
-	if !topoproto.TabletAliasEqual(shardInfo.MasterAlias, masterElectTabletAlias) {
-		if !force {
-			return fmt.Errorf("master-elect tablet %v is not the shard master, use -force to proceed anyway", topoproto.TabletAliasString(masterElectTabletAlias))
-		}
-		wr.logger.Warningf("master-elect tablet %v is not the shard master, proceeding anyway as -force was used", topoproto.TabletAliasString(masterElectTabletAlias))
-	}
-	if _, ok := masterTabletMap[masterElectTabletAliasStr]; !ok {
-		if !force {
-			return fmt.Errorf("master-elect tablet %v is not a master in the shard, use -force to proceed anyway", topoproto.TabletAliasString(masterElectTabletAlias))
-		}
-		wr.logger.Warningf("master-elect tablet %v is not a master in the shard, proceeding anyway as -force was used", topoproto.TabletAliasString(masterElectTabletAlias))
-	}
-	haveOtherMaster := false
-	for alias := range masterTabletMap {
-		if masterElectTabletAliasStr != alias {
-			haveOtherMaster = true
-		}
-	}
-	if haveOtherMaster {
-		if !force {
-			return fmt.Errorf("master-elect tablet %v is not the only master in the shard, use -force to proceed anyway", topoproto.TabletAliasString(masterElectTabletAlias))
-		}
-		wr.logger.Warningf("master-elect tablet %v is not the only master in the shard, proceeding anyway as -force was used", topoproto.TabletAliasString(masterElectTabletAlias))
-	}
-
-	// First phase: reset replication on all tablets. If anyone fails,
-	// we stop. It is probably because it is unreachable, and may leave
-	// an unstable database process in the mix, with a database daemon
-	// at a wrong replication spot.
-
-	// Create a context for the following RPCs that respects waitReplicasTimeout
-	resetCtx, resetCancel := context.WithTimeout(ctx, waitReplicasTimeout)
-	defer resetCancel()
-
-	event.DispatchUpdate(ev, "resetting replication on all tablets")
-	wg := sync.WaitGroup{}
-	rec := concurrency.AllErrorRecorder{}
-	for alias, tabletInfo := range tabletMap {
-		wg.Add(1)
-		go func(alias string, tabletInfo *topo.TabletInfo) {
-			defer wg.Done()
-			wr.logger.Infof("resetting replication on tablet %v", alias)
-			if err := wr.tmc.ResetReplication(resetCtx, tabletInfo.Tablet); err != nil {
-				rec.RecordError(fmt.Errorf("tablet %v ResetReplication failed (either fix it, or Scrap it): %v", alias, err))
-			}
-		}(alias, tabletInfo)
-	}
-	wg.Wait()
-	if err := rec.Error(); err != nil {
-		// if any of the replicas failed
-		return err
-	}
-
-	// Check we still have the topology lock.
-	if err := topo.CheckShardLocked(ctx, keyspace, shard); err != nil {
-		return fmt.Errorf("lost topology lock, aborting: %v", err)
-	}
-
-	// Tell the new master to break its replicas, return its replication
-	// position
-	wr.logger.Infof("initializing master on %v", topoproto.TabletAliasString(masterElectTabletAlias))
-	event.DispatchUpdate(ev, "initializing master")
-	rp, err := wr.tmc.InitMaster(ctx, masterElectTabletInfo.Tablet)
-	if err != nil {
-		return err
-	}
-
-	// Check we stil have the topology lock.
-	if err := topo.CheckShardLocked(ctx, keyspace, shard); err != nil {
-		return fmt.Errorf("lost topology lock, aborting: %v", err)
-	}
-
-	// Create a cancelable context for the following RPCs.
-	// If error conditions happen, we can cancel all outgoing RPCs.
-	replCtx, replCancel := context.WithTimeout(ctx, waitReplicasTimeout)
-	defer replCancel()
-
-	// Now tell the new master to insert the reparent_journal row,
-	// and tell everybody else to become a replica of the new master,
-	// and wait for the row in the reparent_journal table.
-	// We start all these in parallel, to handle the semi-sync
-	// case: for the master to be able to commit its row in the
-	// reparent_journal table, it needs connected replicas.
-	event.DispatchUpdate(ev, "reparenting all tablets")
-	now := time.Now().UnixNano()
-	wgMaster := sync.WaitGroup{}
-	wgReplicas := sync.WaitGroup{}
-	var masterErr error
-	for alias, tabletInfo := range tabletMap {
-		if alias == masterElectTabletAliasStr {
-			wgMaster.Add(1)
-			go func(alias string, tabletInfo *topo.TabletInfo) {
-				defer wgMaster.Done()
-				wr.logger.Infof("populating reparent journal on new master %v", alias)
-				masterErr = wr.tmc.PopulateReparentJournal(replCtx, tabletInfo.Tablet, now, initShardMasterOperation, masterElectTabletAlias, rp)
-			}(alias, tabletInfo)
-		} else {
-			wgReplicas.Add(1)
-			go func(alias string, tabletInfo *topo.TabletInfo) {
-				defer wgReplicas.Done()
-				wr.logger.Infof("initializing replica %v", alias)
-				if err := wr.tmc.InitReplica(replCtx, tabletInfo.Tablet, masterElectTabletAlias, rp, now); err != nil {
-					rec.RecordError(fmt.Errorf("tablet %v InitReplica failed: %v", alias, err))
-				}
-			}(alias, tabletInfo)
-		}
-	}
-
-	// After the master is done, we can update the shard record
-	// (note with semi-sync, it also means at least one replica is done).
-	wgMaster.Wait()
-	if masterErr != nil {
-		// The master failed, there is no way the
-		// replicas will work.  So we cancel them all.
-		wr.logger.Warningf("master failed to PopulateReparentJournal, canceling replicas")
-		replCancel()
-		wgReplicas.Wait()
-		return fmt.Errorf("failed to PopulateReparentJournal on master: %v", masterErr)
-	}
-	if !topoproto.TabletAliasEqual(shardInfo.MasterAlias, masterElectTabletAlias) {
-		if _, err := wr.ts.UpdateShardFields(ctx, keyspace, shard, func(si *topo.ShardInfo) error {
-			si.MasterAlias = masterElectTabletAlias
-			return nil
-		}); err != nil {
-			wgReplicas.Wait()
-			return fmt.Errorf("failed to update shard master record: %v", err)
-		}
-	}
-
-	// Wait for the replicas to complete. If some of them fail, we
-	// don't want to rebuild the shard serving graph (the failure
-	// will most likely be a timeout, and our context will be
-	// expired, so the rebuild will fail anyway)
-	wgReplicas.Wait()
-	if err := rec.Error(); err != nil {
-		return err
-	}
-
-	// Create database if necessary on the master. replicas will get it too through
-	// replication. Since the user called InitShardMaster, they've told us to
-	// assume that whatever data is on all the replicas is what they intended.
-	// If the database doesn't exist, it means the user intends for these tablets
-	// to begin serving with no data (i.e. first time initialization).
-	createDB := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", sqlescape.EscapeID(topoproto.TabletDbName(masterElectTabletInfo.Tablet)))
-	if _, err := wr.tmc.ExecuteFetchAsDba(ctx, masterElectTabletInfo.Tablet, false, []byte(createDB), 1, false, true); err != nil {
-		return fmt.Errorf("failed to create database: %v", err)
-	}
-	// Refresh the state to force the tabletserver to reconnect after db has been created.
-	if err := wr.tmc.RefreshState(ctx, masterElectTabletInfo.Tablet); err != nil {
-		log.Warningf("RefreshState failed: %v", err)
-	}
-
-	return nil
-}
-
 // PlannedReparentShard will make the provided tablet the master for the shard,
 // when both the current and new master are reachable and in good shape.
 func (wr *Wrangler) PlannedReparentShard(ctx context.Context, keyspace, shard string, masterElectTabletAlias, avoidMasterAlias *topodatapb.TabletAlias, waitReplicasTimeout time.Duration) (err error) {
diff --git a/misc/git/hooks/goimports b/misc/git/hooks/goimports
index 389f3877223..a8859b5e104 100755
--- a/misc/git/hooks/goimports
+++ b/misc/git/hooks/goimports
@@ -19,7 +19,7 @@
 # it has execute permissions.
 #
 # This script does not handle file names that contain spaces.
-gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '^go/.*\.go$')
+gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '^go/.*\.go$' | grep -v '^go/vt/proto/')
 
 [ -z "$gofiles" ] && exit 0
 unformatted=$(goimports -local vitess.io/vitess -l=true $gofiles 2>&1 | awk -F: '{print $1}')
diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto
index 1a7142ea09e..c9cc662ca7d 100644
--- a/proto/vtctldata.proto
+++ b/proto/vtctldata.proto
@@ -24,6 +24,7 @@ package vtctldata;
 
 import "logutil.proto";
 import "topodata.proto";
+import "google/protobuf/duration.proto";
 
 // ExecuteVtctlCommandRequest is the payload for ExecuteVtctlCommand.
 // timeouts are in nanoseconds.
@@ -52,6 +53,18 @@ message GetKeyspaceResponse {
   Keyspace keyspace = 1;
 }
 
+message InitShardPrimaryRequest {
+  string keyspace = 1;
+  string shard = 2;
+  topodata.TabletAlias primary_elect_tablet_alias = 3;
+  bool force = 4;
+  google.protobuf.Duration wait_replicas_timeout = 5;
+}
+
+message InitShardPrimaryResponse {
+  repeated logutil.Event events = 1;
+}
+
 message Keyspace {
   string name = 1;
   topodata.Keyspace keyspace = 2;
diff --git a/proto/vtctlservice.proto b/proto/vtctlservice.proto
index ebd82714774..6c5b020469d 100644
--- a/proto/vtctlservice.proto
+++ b/proto/vtctlservice.proto
@@ -37,4 +37,11 @@ service Vtctld {
   rpc GetKeyspace(vtctldata.GetKeyspaceRequest) returns (vtctldata.GetKeyspaceResponse) {};
   // GetKeyspaces returns the keyspace struct of all keyspaces in the topo.
   rpc GetKeyspaces(vtctldata.GetKeyspacesRequest) returns (vtctldata.GetKeyspacesResponse) {};
+  // InitShardPrimary sets the initial primary for a shard. Will make all other
+  // tablets in the shard replicas of the provided primary.
+  //
+  // WARNING: This could cause data loss on an already replicating shard.
+  // PlannedReparentShard or EmergencyReparentShard should be used in those
+  // cases instead.
+  rpc InitShardPrimary(vtctldata.InitShardPrimaryRequest) returns (vtctldata.InitShardPrimaryResponse) {};
 }