From ff915ee308c8aad7f21783e44b11bc7435e44c49 Mon Sep 17 00:00:00 2001
From: Bartosz Sypytkowski <b.sypytkowski@gmail.com>
Date: Sat, 19 Dec 2015 21:13:16 +0100
Subject: [PATCH 1/2] enclosed some API in akka cluster plugins

---
 .../ClusterShardingFailureSpec.cs             |    3 +-
 .../ClusterShardingGracefulShutdownSpec.cs    |    4 +-
 .../ClusterShardingSpec.cs                    |   14 +-
 .../Akka.Cluster.Sharding.csproj              |    3 +
 .../Akka.Cluster.Sharding/ClusterSharding.cs  |  219 +-
 .../ClusterShardingGuardian.cs                |    2 +-
 .../PersistentShardCoordinator.cs             |   10 +-
 .../Properties/AssemblyInfo.cs                |    1 +
 .../ClusterShardingMessageSerializer.cs       |  339 +
 .../Proto/ClusterShardingMessages.cs          | 6806 ++++++++---------
 .../cluster/Akka.Cluster.Sharding/Shard.cs    |   38 +-
 .../Akka.Cluster.Sharding/ShardRegion.cs      |  204 +-
 .../Akka.Cluster.Sharding/ShardingMessages.cs |  199 +
 .../DistributedPubSubMediatorSpec.cs          |   96 +-
 .../Client/ClusterClient.cs                   |   12 +-
 .../Client/ClusterClientReceptionist.cs       |   12 +-
 .../Client/ClusterReceptionist.cs             |   22 +-
 .../Properties/AssemblyInfo.cs                |    1 +
 .../PublishSubscribe/DistributedMessages.cs   |  642 +-
 .../DistributedPubSubMediator.cs              |   40 +-
 .../Internal/TopicMessages.cs                 |   32 +-
 .../PublishSubscribe/Internal/Topics.cs       |   28 +-
 .../DistributedPubSubMessageSerializer.cs     |   48 +-
 .../protobuf/ClusterShardingMessages.proto    |   54 +
 .../ClusterSharding.Node/App.config           |    3 +
 .../ClusterSharding.Node.csproj               |    1 +
 .../ClusterSharding.Node/MessageExtractor.cs  |   25 +
 .../ClusterSharding.Node/Printer.cs           |   25 -
 .../ClusterSharding.Node/Program.cs           |    4 +-
 .../ClusterToolsExample.Node/App.config       |   17 +-
 .../ClusterToolsExample.Seed/App.config       |   17 +-
 .../ClusterToolsExample.Seed/Program.cs       |    2 +-
 .../ClusterToolsExample.Shared/Echo.cs        |    6 +-
 33 files changed, 4577 insertions(+), 4352 deletions(-)
 create mode 100644 src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
 create mode 100644 src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
 create mode 100644 src/core/protobuf/ClusterShardingMessages.proto
 create mode 100644 src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingFailureSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingFailureSpec.cs
index 7971a2373d1..e03d4cbd7d7 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingFailureSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingFailureSpec.cs
@@ -14,7 +14,6 @@
 using Akka.Persistence.Journal;
 using Akka.Remote.TestKit;
 using Akka.Remote.Transport;
-using Xunit;
 
 namespace Akka.Cluster.Sharding.Tests
 {
@@ -276,7 +275,7 @@ public void ClusterSharding_with_flaky_journal_should_recover_after_journal_fail
                     region.Tell(new Add("11", 1));
 
                     //Test the Shard passivate works during a journal failure
-                    shard2.Tell(new ShardRegion.Passivate(PoisonPill.Instance), entity21);
+                    shard2.Tell(new Passivate(PoisonPill.Instance), entity21);
                     region.Tell(new Add("21", 1));
 
                     region.Tell(new Get("21"));
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingGracefulShutdownSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingGracefulShutdownSpec.cs
index 6434035881e..ab61212e16a 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingGracefulShutdownSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingGracefulShutdownSpec.cs
@@ -84,7 +84,7 @@ protected override void OnReceive(object message)
                 if (message.Equals("leave"))
                 {
                     Context.Watch(_region);
-                    _region.Tell(ShardRegion.GracefulShutdown.Instance);
+                    _region.Tell(GracefulShutdown.Instance);
                 }
                 else if ((terminated = message as Terminated) != null && terminated.ActorRef.Equals(_region))
                 {
@@ -214,7 +214,7 @@ public void ClusterSharding_should_gracefully_shutdown_a_region()
 
             RunOn(() =>
             {
-                _region.Value.Tell(ShardRegion.GracefulShutdown.Instance);
+                _region.Value.Tell(GracefulShutdown.Instance);
             }, _second);
 
             RunOn(() =>
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSpec.cs
index f727619722d..5f6a7c519e4 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSpec.cs
@@ -6,11 +6,9 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using Akka.Cluster.Sharding;
 using Akka.Configuration;
 using Akka.Persistence;
 using Akka.Remote.TestKit;
@@ -189,7 +187,7 @@ protected override bool ReceiveCommand(object message)
                 .With<Increment>(_ => Persist(new CounterChanged(1), UpdateState))
                 .With<Increment>(_ => Persist(new CounterChanged(-1), UpdateState))
                 .With<Get>(_ => Sender.Tell(_count))
-                .With<ReceiveTimeout>(_ => Context.Parent.Tell(new ShardRegion.Passivate(Stop.Instance)))
+                .With<ReceiveTimeout>(_ => Context.Parent.Tell(new Passivate(Stop.Instance)))
                 .With<Stop>(_ => Context.Stop(Self))
                 .WasHandled;
         }
@@ -383,8 +381,8 @@ public void ClusterSharding_should_work_in_single_node_cluster()
                     r.Tell(new Counter.Get(1));
 
                     ExpectMsg(2);
-                    r.Tell(ShardRegion.GetCurrentRegions.Instance);
-                    ExpectMsg<ShardRegion.CurrentRegions>(m => m.Regions.Length == 1 && m.Regions[0].Equals(Cluster.SelfAddress));
+                    r.Tell(GetCurrentRegions.Instance);
+                    ExpectMsg<CurrentRegions>(m => m.Regions.Length == 1 && m.Regions[0].Equals(Cluster.SelfAddress));
                 }, _first);
 
                 EnterBarrier("after-2");
@@ -445,8 +443,8 @@ public void ClusterSharding_should_use_second_node()
                     ExpectMsg(3);
                     Assert.Equal(r.Path / "2" / "2", LastSender.Path);
 
-                    r.Tell(ShardRegion.GetCurrentRegions.Instance);
-                    ExpectMsg<ShardRegion.CurrentRegions>(x => x.Regions.Length == 2
+                    r.Tell(GetCurrentRegions.Instance);
+                    ExpectMsg<CurrentRegions>(x => x.Regions.Length == 2
                                                    && x.Regions[0].Equals(Cluster.SelfAddress)
                                                    && x.Regions[1].Equals(Node(_first).Address));
                 }, _second);
@@ -906,7 +904,7 @@ public void Persistent_cluster_shards_should_permanently_stop_entities_which_pas
 
                     //Send the shard the passivate message from the counter
                     Watch(counter1);
-                    shard.Tell(new ShardRegion.Passivate(Counter.Stop.Instance), counter1);
+                    shard.Tell(new Passivate(Counter.Stop.Instance), counter1);
 
                     // watch for the Terminated message
                     ExpectTerminated(counter1, TimeSpan.FromSeconds(5));
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
index f2229d5617b..9726833f1fc 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
@@ -59,9 +59,11 @@
     <Compile Include="PersistentShardCoordinator.cs" />
     <Compile Include="PersistentShardCoordinator.Messages.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Serialization\ClusterShardingMessageSerializer.cs" />
     <Compile Include="Serialization\Proto\ClusterShardingMessages.cs" />
     <Compile Include="Shard.cs" />
     <Compile Include="ShardAllocationStrategy.cs" />
+    <Compile Include="ShardingMessages.cs" />
     <Compile Include="ShardRegion.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -92,6 +94,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs
index ca55cbcb8d0..b9e01be4bdd 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Configuration;
 using Akka.Dispatch;
@@ -68,12 +69,12 @@ public virtual string ShardId(object message)
     /// several nodes in the cluster and you want to be able to interact with them using their
     /// logical identifier, but without having to care about their physical location in the cluster,
     /// which might also change over time. It could for example be actors representing Aggregate Roots in
-    /// Domain-Driven Design terminology. Here we call these actors "entries". These actors
+    /// Domain-Driven Design terminology. Here we call these actors "entities". These actors
     /// typically have persistent (durable) state, but this feature is not limited to
     /// actors with persistent state.
     /// </para>
     /// <para>
-    /// In this context sharding means that actors with an identifier, so called entries,
+    /// In this context sharding means that actors with an identifier, so called entities,
     /// can be automatically distributed across multiple nodes in the cluster. Each entity
     /// actor runs only at one place, and messages can be sent to the entity without requiring
     /// the sender to know the location of the destination actor. This is achieved by sending
@@ -84,7 +85,7 @@ public virtual string ShardId(object message)
     /// This extension is supposed to be used by first, typically at system startup on each node
     /// in the cluster, registering the supported entity types with the <see cref="ClusterShardingGuardian.Start"/>
     /// method and then the <see cref="Sharding.ShardRegion"/> actor for a named entity type can be retrieved with
-    /// <see cref="ClusterSharding.ShardRegion"/>. Messages to the entries are always sent via the local
+    /// <see cref="ClusterSharding.ShardRegion"/>. Messages to the entities are always sent via the local
     /// <see cref="Sharding.ShardRegion"/>. Some settings can be configured as described in the `akka.contrib.cluster.sharding`
     /// section of the `reference.conf`.
     /// </para>
@@ -92,7 +93,7 @@ public virtual string ShardId(object message)
     /// The <see cref="Sharding.ShardRegion"/> actor is started on each node in the cluster, or group of nodes
     /// tagged with a specific role. The <see cref="Sharding.ShardRegion"/> is created with two application specific
     /// functions to extract the entity identifier and the shard identifier from incoming messages.
-    /// A shard is a group of entries that will be managed together. For the first message in a
+    /// A shard is a group of entities that will be managed together. For the first message in a
     /// specific shard the <see cref="Sharding.ShardRegion"/> request the location of the shard from a central coordinator,
     /// the <see cref="PersistentShardCoordinator"/>. The <see cref="PersistentShardCoordinator"/> decides which <see cref="Sharding.ShardRegion"/> that
     /// owns the shard. The <see cref="Sharding.ShardRegion"/> receives the decided home of the shard
@@ -120,18 +121,18 @@ public virtual string ShardId(object message)
     /// </para>
     /// <para>
     /// To be able to use newly added members in the cluster the coordinator facilitates rebalancing
-    /// of shards, i.e. migrate entries from one node to another. In the rebalance process the
+    /// of shards, i.e. migrate entities from one node to another. In the rebalance process the
     /// coordinator first notifies all <see cref="Sharding.ShardRegion"/> actors that a handoff for a shard has started.
     /// That means they will start buffering incoming messages for that shard, in the same way as if the
     /// shard location is unknown. During the rebalance process the coordinator will not answer any
     /// requests for the location of shards that are being rebalanced, i.e. local buffering will
     /// continue until the handoff is completed. The <see cref="Sharding.ShardRegion"/> responsible for the rebalanced shard
-    /// will stop all entries in that shard by sending `PoisonPill` to them. When all entries have
-    /// been terminated the <see cref="Sharding.ShardRegion"/> owning the entries will acknowledge the handoff as completed
+    /// will stop all entities in that shard by sending `PoisonPill` to them. When all entities have
+    /// been terminated the <see cref="Sharding.ShardRegion"/> owning the entities will acknowledge the handoff as completed
     /// to the coordinator. Thereafter the coordinator will reply to requests for the location of
     /// the shard and thereby allocate a new home for the shard and then buffered messages in the
-    /// <see cref="Sharding.ShardRegion"/> actors are delivered to the new location. This means that the state of the entries
-    /// are not transferred or migrated. If the state of the entries are of importance it should be
+    /// <see cref="Sharding.ShardRegion"/> actors are delivered to the new location. This means that the state of the entities
+    /// are not transferred or migrated. If the state of the entities are of importance it should be
     /// persistent (durable), e.g. with `Akka.Persistence`, so that it can be recovered at the new
     /// location.
     /// </para>
@@ -166,13 +167,13 @@ public virtual string ShardId(object message)
     /// shard resolution, e.g. to avoid too fine grained shards.
     /// <para>
     /// The <see cref="Sharding.ShardRegion"/> actor can also be started in proxy only mode, i.e. it will not
-    /// host any entries itself, but knows how to delegate messages to the right location.
+    /// host any entities itself, but knows how to delegate messages to the right location.
     /// A <see cref="Sharding.ShardRegion"/> starts in proxy only mode if the roles of the node does not include
     /// the node role specified in `akka.contrib.cluster.sharding.role` config property
     /// or if the specified `EntityProps` is `null`.
     /// </para>
     /// <para>
-    /// If the state of the entries are persistent you may stop entries that are not used to
+    /// If the state of the entities are persistent you may stop entities that are not used to
     /// reduce memory consumption. This is done by the application specific implementation of
     /// the entity actors for example by defining receive timeout (<see cref="IActorContext.SetReceiveTimeout"/>).
     /// If a message is already enqueued to the entity when it stops itself the enqueued message
@@ -263,6 +264,50 @@ public IActorRef Start(
             return shardRegion;
         }
 
+        /// <summary>
+        /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
+        /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
+        /// actor for this type can later be retrieved with the <see cref="ShardRegion"/> method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type</param>
+        /// <param name="entityProps">
+        /// The <see cref="Actor.Props"/> of the entity actors that will be created by the <see cref="Sharding.ShardRegion"/> 
+        /// </param>
+        /// <param name="settings">Configuration settings, see <see cref="ClusterShardingSettings"/></param>
+        /// <param name="idExtractor">
+        /// Partial function to extract the entity id and the message to send to the entity from the incoming message, 
+        /// if the partial function does not match the message will be `unhandled`, 
+        /// i.e.posted as `Unhandled` messages on the event stream
+        /// </param>
+        /// <param name="shardResolver">
+        /// Function to determine the shard id for an incoming message, only messages that passed the `extractEntityId` will be used
+        /// </param>
+        /// <param name="allocationStrategy">Possibility to use a custom shard allocation and rebalancing logic</param>
+        /// <param name="handOffStopMessage">
+        /// The message that will be sent to entities when they are to be stopped for a rebalance or 
+        /// graceful shutdown of a <see cref="Sharding.ShardRegion"/>, e.g. <see cref="PoisonPill"/>.
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public async Task<IActorRef> StartAsync(
+            string typeName, //TODO: change type name to type instance?
+            Props entityProps,
+            ClusterShardingSettings settings,
+            IdExtractor idExtractor,
+            ShardResolver shardResolver,
+            IShardAllocationStrategy allocationStrategy,
+            object handOffStopMessage)
+        {
+            RequireClusterRole(settings.Role);
+
+            var timeout = _system.Settings.CreationTimeout;
+            var startMsg = new ClusterShardingGuardian.Start(typeName, entityProps, settings, idExtractor, shardResolver, allocationStrategy, handOffStopMessage);
+
+            var started = await _guardian.Value.Ask<ClusterShardingGuardian.Started>(startMsg, timeout);
+            var shardRegion = started.ShardRegion;
+            _regions.TryAdd(typeName, shardRegion);
+            return shardRegion;
+        }
+
         /// <summary>
         /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
         /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
@@ -295,6 +340,38 @@ public IActorRef Start(
             return Start(typeName, entityProps, settings, idExtractor, shardResolver, allocationStrategy, PoisonPill.Instance);
         }
 
+        /// <summary>
+        /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
+        /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
+        /// actor for this type can later be retrieved with the <see cref="ShardRegion"/> method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type</param>
+        /// <param name="entityProps">
+        /// The <see cref="Actor.Props"/> of the entity actors that will be created by the <see cref="Sharding.ShardRegion"/> 
+        /// </param>
+        /// <param name="settings">Configuration settings, see <see cref="ClusterShardingSettings"/></param>
+        /// <param name="idExtractor">
+        /// Partial function to extract the entity id and the message to send to the entity from the incoming message, 
+        /// if the partial function does not match the message will be `unhandled`, 
+        /// i.e.posted as `Unhandled` messages on the event stream
+        /// </param>
+        /// <param name="shardResolver">
+        /// Function to determine the shard id for an incoming message, only messages that passed the `extractEntityId` will be used
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public Task<IActorRef> StartAsync(
+            string typeName, //TODO: change type name to type instance?
+            Props entityProps,
+            ClusterShardingSettings settings,
+            IdExtractor idExtractor,
+            ShardResolver shardResolver)
+        {
+            var allocationStrategy = new LeastShardAllocationStrategy(
+                Settings.TunningParameters.LeastShardAllocationRebalanceThreshold,
+                Settings.TunningParameters.LeastShardAllocationMaxSimultaneousRebalance);
+            return StartAsync(typeName, entityProps, settings, idExtractor, shardResolver, allocationStrategy, PoisonPill.Instance);
+        }
+
         /// <summary>
         /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
         /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
@@ -323,6 +400,34 @@ public IActorRef Start(string typeName, Props entityProps, ClusterShardingSettin
             return Start(typeName, entityProps, settings, idExtractor, shardResolver, allocationStrategy, handOffMessage);
         }
 
+        /// <summary>
+        /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
+        /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
+        /// actor for this type can later be retrieved with the <see cref="ShardRegion"/> method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type</param>
+        /// <param name="entityProps">
+        /// The <see cref="Actor.Props"/> of the entity actors that will be created by the <see cref="Sharding.ShardRegion"/> 
+        /// </param>
+        /// <param name="settings">Configuration settings, see <see cref="ClusterShardingSettings"/></param>
+        /// <param name="messageExtractor">
+        /// Functions to extract the entity id, shard id, and the message to send to the entity from the incoming message.
+        /// </param>
+        /// <param name="allocationStrategy">Possibility to use a custom shard allocation and rebalancing logic</param>
+        /// <param name="handOffMessage">
+        /// The message that will be sent to entities when they are to be stopped for a rebalance or 
+        /// graceful shutdown of a <see cref="Sharding.ShardRegion"/>, e.g. <see cref="PoisonPill"/>.
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public Task<IActorRef> StartAsync(string typeName, Props entityProps, ClusterShardingSettings settings,
+            IMessageExtractor messageExtractor, IShardAllocationStrategy allocationStrategy, object handOffMessage)
+        {
+            IdExtractor idExtractor = messageExtractor.ToIdExtractor();
+            ShardResolver shardResolver = messageExtractor.ShardId;
+
+            return StartAsync(typeName, entityProps, settings, idExtractor, shardResolver, allocationStrategy, handOffMessage);
+        }
+
         /// <summary>
         /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
         /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
@@ -350,6 +455,33 @@ public IActorRef Start(string typeName, Props entityProps, ClusterShardingSettin
                 PoisonPill.Instance);
         }
 
+        /// <summary>
+        /// Register a named entity type by defining the <see cref="Actor.Props"/> of the entity actor and 
+        /// functions to extract entity and shard identifier from messages. The <see cref="Sharding.ShardRegion"/> 
+        /// actor for this type can later be retrieved with the <see cref="ShardRegion"/> method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type</param>
+        /// <param name="entityProps">
+        /// The <see cref="Actor.Props"/> of the entity actors that will be created by the <see cref="Sharding.ShardRegion"/> 
+        /// </param>
+        /// <param name="settings">Configuration settings, see <see cref="ClusterShardingSettings"/></param>
+        /// <param name="messageExtractor">
+        /// Functions to extract the entity id, shard id, and the message to send to the entity from the incoming message.
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public Task<IActorRef> StartAsync(string typeName, Props entityProps, ClusterShardingSettings settings,
+            IMessageExtractor messageExtractor)
+        {
+            return StartAsync(typeName,
+                entityProps,
+                settings,
+                messageExtractor,
+                new LeastShardAllocationStrategy(
+                    Settings.TunningParameters.LeastShardAllocationRebalanceThreshold,
+                    Settings.TunningParameters.LeastShardAllocationMaxSimultaneousRebalance),
+                PoisonPill.Instance);
+        }
+
         /// <summary>
         /// Register a named entity type `ShardRegion` on this node that will run in proxy only mode, i.e.it will 
         /// delegate messages to other `ShardRegion` actors on other nodes, but not host any entity actors itself.
@@ -380,6 +512,36 @@ public IActorRef StartProxy(string typeName, string role, IdExtractor idExtracto
             return started.ShardRegion;
         }
 
+        /// <summary>
+        /// Register a named entity type `ShardRegion` on this node that will run in proxy only mode, i.e.it will 
+        /// delegate messages to other `ShardRegion` actors on other nodes, but not host any entity actors itself.
+        /// The <see cref="Sharding.ShardRegion"/>  actor for this type can later be retrieved with the 
+        /// <see cref="ShardRegion"/>  method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type.</param>
+        /// <param name="role">
+        /// Specifies that this entity type is located on cluster nodes with a specific role. 
+        /// If the role is not specified all nodes in the cluster are used.
+        /// </param>
+        /// <param name="idExtractor">
+        /// Partial function to extract the entity id and the message to send to the  entity from the incoming message, 
+        /// if the partial function does not match the message will  be `unhandled`, i.e.posted as `Unhandled` messages 
+        /// on the event stream
+        /// </param>
+        /// <param name="shardResolver">
+        /// Function to determine the shard id for an incoming message, only messages that passed the `extractEntityId` will be used
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public async Task<IActorRef> StartProxyAsync(string typeName, string role, IdExtractor idExtractor, ShardResolver shardResolver)
+        {
+            var timeout = _system.Settings.CreationTimeout;
+            var settings = ClusterShardingSettings.Create(_system).WithRole(role);
+            var startMsg = new ClusterShardingGuardian.StartProxy(typeName, settings, idExtractor, shardResolver);
+            var started = await _guardian.Value.Ask<ClusterShardingGuardian.Started>(startMsg, timeout);
+            _regions.TryAdd(typeName, started.ShardRegion);
+            return started.ShardRegion;
+        }
+
         /// <summary>
         /// Register a named entity type `ShardRegion` on this node that will run in proxy only mode, i.e.it will 
         /// delegate messages to other `ShardRegion` actors on other nodes, but not host any entity actors itself.
@@ -407,6 +569,33 @@ public IActorRef StartProxy(string typeName, string role, IMessageExtractor mess
             return StartProxy(typeName, role, extractEntityId, messageExtractor.ShardId);
         }
 
+        /// <summary>
+        /// Register a named entity type `ShardRegion` on this node that will run in proxy only mode, i.e.it will 
+        /// delegate messages to other `ShardRegion` actors on other nodes, but not host any entity actors itself.
+        /// The <see cref="Sharding.ShardRegion"/>  actor for this type can later be retrieved with the 
+        /// <see cref="ShardRegion"/>  method.
+        /// </summary>
+        /// <param name="typeName">The name of the entity type.</param>
+        /// <param name="role">
+        /// Specifies that this entity type is located on cluster nodes with a specific role. 
+        /// If the role is not specified all nodes in the cluster are used.
+        /// </param>
+        /// <param name="messageExtractor">
+        /// Functions to extract the entity id, shard id, and the message to send to the entity from the incoming message.
+        /// </param>
+        /// <returns>The actor ref of the <see cref="Sharding.ShardRegion"/> that is to be responsible for the shard.</returns>
+        public Task<IActorRef> StartProxyAsync(string typeName, string role, IMessageExtractor messageExtractor)
+        {
+            IdExtractor extractEntityId = msg =>
+            {
+                var entityId = messageExtractor.EntityId(msg);
+                var entityMessage = messageExtractor.EntityMessage(msg);
+                return Tuple.Create(entityId, entityMessage);
+            };
+
+            return StartProxyAsync(typeName, role, extractEntityId, messageExtractor.ShardId);
+        }
+
         /// <summary>
         /// Retrieve the actor reference of the <see cref="Sharding.ShardRegion"/> actor responsible for the named entity type.
         /// The entity type must be registered with the <see cref="ClusterShardingGuardian.Start"/> method before it can be used here.
@@ -484,7 +673,7 @@ public interface IMessageExtractor
         string ShardId(object message);
     }
 
-    public static class Extensions
+    internal static class Extensions
     {
         public static IdExtractor ToIdExtractor(this IMessageExtractor self)
         {
@@ -533,7 +722,7 @@ public RebalanceDone(string shard, bool ok)
     /// <see cref="PersistentShardCoordinator"/>. If the process takes longer than the `handOffTimeout` it 
     /// also sends <see cref="RebalanceDone"/>.
     /// </summary>
-    public class RebalanceWorker : ActorBase
+    internal class RebalanceWorker : ActorBase
     {
         public static Props Props(string shard, IActorRef @from, TimeSpan handOffTimeout, IEnumerable<IActorRef> regions)
         {
@@ -595,7 +784,7 @@ private void Done(bool ok)
     /// Check if we've received a shard start request.
     /// </summary>
     [Serializable]
-    public sealed class ResendShardHost
+    internal sealed class ResendShardHost
     {
         public readonly ShardId Shard;
         public readonly IActorRef Region;
@@ -608,7 +797,7 @@ public ResendShardHost(string shard, IActorRef region)
     }
 
     [Serializable]
-    public sealed class DelayedShardRegionTerminated
+    internal sealed class DelayedShardRegionTerminated
     {
         public readonly IActorRef Region;
 
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs
index ce6e2da4852..e58c74ddd42 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs
@@ -15,7 +15,7 @@ namespace Akka.Cluster.Sharding
     /// <summary>
     /// INTERNAL API: <see cref="ShardRegion"/> and <see cref="PersistentShardCoordinator"/> actors are createad as children of this actor.
     /// </summary>
-    public sealed class ClusterShardingGuardian : ReceiveActor
+    internal sealed class ClusterShardingGuardian : ReceiveActor
     {
         #region messages
 
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
index 6bd92586bd9..720c1a5ff3c 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.cs
@@ -6,10 +6,8 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Event;
 using Akka.Persistence;
@@ -29,7 +27,7 @@ public partial class PersistentShardCoordinator : PersistentActor
         /// Persistent state of the event sourced PersistentShardCoordinator.
         /// </summary>
         [Serializable]
-        public sealed class State
+        internal protected sealed class State
         {
             public static readonly State Empty = new State();
 
@@ -142,7 +140,7 @@ public State Copy(IImmutableDictionary<ShardId, IActorRef> shards = null,
         /// <summary>
         /// Factory method for the <see cref="Actor.Props"/> of the <see cref="PersistentShardCoordinator"/> actor.
         /// </summary>
-        public static Props Props(string typeName, ClusterShardingSettings settings, IShardAllocationStrategy allocationStrategy)
+        internal static Props Props(string typeName, ClusterShardingSettings settings, IShardAllocationStrategy allocationStrategy)
         {
             return Actor.Props.Create(() => new PersistentShardCoordinator(typeName, settings, allocationStrategy)).WithDeploy(Deploy.Local);
         }
@@ -223,12 +221,12 @@ protected bool Active(object message)
                 // it will soon be stopped when singleton is stopped
                 Context.Become(ShuttingDown);
             }
-            else if (message is ShardRegion.GetCurrentRegions)
+            else if (message is GetCurrentRegions)
             {
                 var regions = _currentState.Regions.Keys
                     .Select(region => string.IsNullOrEmpty(region.Path.Address.Host) ? Cluster.SelfAddress : region.Path.Address)
                     .ToArray();
-                Sender.Tell(new ShardRegion.CurrentRegions(regions));
+                Sender.Tell(new CurrentRegions(regions));
             }
             else if (message is ClusterEvent.CurrentClusterState)
             {
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
index e4b191ab2d8..af9e57c05e2 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
@@ -13,6 +13,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: InternalsVisibleTo("Akka.Cluster.Sharding.Tests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
new file mode 100644
index 00000000000..7469e29d357
--- /dev/null
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
@@ -0,0 +1,339 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using Akka.Actor;
+using Akka.Serialization;
+using Google.ProtocolBuffers;
+
+namespace Akka.Cluster.Sharding.Serialization
+{
+    public class ClusterShardingMessageSerializer : SerializerWithStringManifest
+    {
+        #region manifests
+
+        private const string CoordinatorStateManifest = "AA";
+        private const string ShardRegionRegisteredManifest = "AB";
+        private const string ShardRegionProxyRegisteredManifest = "AC";
+        private const string ShardRegionTerminatedManifest = "AD";
+        private const string ShardRegionProxyTerminatedManifest = "AE";
+        private const string ShardHomeAllocatedManifest = "AF";
+        private const string ShardHomeDeallocatedManifest = "AG";
+
+        private const string RegisterManifest = "BA";
+        private const string RegisterProxyManifest = "BB";
+        private const string RegisterAckManifest = "BC";
+        private const string GetShardHomeManifest = "BD";
+        private const string ShardHomeManifest = "BE";
+        private const string HostShardManifest = "BF";
+        private const string ShardStartedManifest = "BG";
+        private const string BeginHandOffManifest = "BH";
+        private const string BeginHandOffAckManifest = "BI";
+        private const string HandOffManifest = "BJ";
+        private const string ShardStoppedManifest = "BK";
+        private const string GracefulShutdownReqManifest = "BL";
+
+        private const string EntityStateManifest = "CA";
+        private const string EntityStartedManifest = "CB";
+        private const string EntityStoppedManifest = "CD";
+
+        private const string GetShardStatsManifest = "DA";
+        private const string ShardStatsManifest = "DB";
+
+        #endregion
+
+        private readonly Dictionary<string, Func<byte[], object>> _fromBinaryMap;
+
+        public const int BufferSize = 1024 << 2;
+
+        private readonly int _identifier;
+        private ExtendedActorSystem _system;
+
+        public ClusterShardingMessageSerializer(ExtendedActorSystem system) : base(system)
+        {
+            _system = system;
+            _identifier = SerializerIdentifierHelper.GetSerializerIdentifierFromConfig(this.GetType(), system);
+
+            _fromBinaryMap = new Dictionary<string, Func<byte[], object>>
+            {
+                {EntityStateManifest, EntityStateFromBinary},
+                {EntityStartedManifest, EntityStartedFromBinary},
+                {EntityStoppedManifest, EntityStoppedFromBinary},
+
+                {CoordinatorStateManifest, CoordinatorStateFromBinary},
+                {ShardRegionRegisteredManifest, bytes => new PersistentShardCoordinator.ShardRegionRegistered(ActorRefMessageFromBinary(bytes)) },
+                {ShardRegionProxyRegisteredManifest, bytes => new PersistentShardCoordinator.ShardRegionProxyRegistered(ActorRefMessageFromBinary(bytes)) },
+                {ShardRegionTerminatedManifest, bytes => new PersistentShardCoordinator.ShardRegionTerminated(ActorRefMessageFromBinary(bytes)) },
+                {ShardRegionProxyTerminatedManifest, bytes => new PersistentShardCoordinator.ShardRegionProxyTerminated(ActorRefMessageFromBinary(bytes)) },
+                {ShardHomeAllocatedManifest, ShardHomeAllocatedFromBinary},
+                {ShardHomeDeallocatedManifest, bytes => new PersistentShardCoordinator.ShardHomeDeallocated(ShardIdMessageFromBinary(bytes)) },
+
+                {RegisterManifest, bytes => new PersistentShardCoordinator.Register(ActorRefMessageFromBinary(bytes)) },
+                {RegisterProxyManifest, bytes => new PersistentShardCoordinator.RegisterProxy(ActorRefMessageFromBinary(bytes)) },
+                {RegisterAckManifest, bytes => new PersistentShardCoordinator.RegisterAck(ActorRefMessageFromBinary(bytes)) },
+                {GetShardHomeManifest, bytes => new PersistentShardCoordinator.GetShardHome(ShardIdMessageFromBinary(bytes)) },
+                {ShardHomeManifest, ShardHomeFromBinary},
+                {HostShardManifest, bytes => new PersistentShardCoordinator.HostShard(ShardIdMessageFromBinary(bytes)) },
+                {ShardStartedManifest, bytes => new PersistentShardCoordinator.ShardStarted(ShardIdMessageFromBinary(bytes)) },
+                {BeginHandOffManifest, bytes => new PersistentShardCoordinator.BeginHandOff(ShardIdMessageFromBinary(bytes)) },
+                {BeginHandOffAckManifest, bytes => new PersistentShardCoordinator.BeginHandOffAck(ShardIdMessageFromBinary(bytes)) },
+                {HandOffManifest, bytes => new PersistentShardCoordinator.HandOff(ShardIdMessageFromBinary(bytes)) },
+                {ShardStoppedManifest, bytes => new PersistentShardCoordinator.ShardStopped(ShardIdMessageFromBinary(bytes)) },
+                {GracefulShutdownReqManifest, bytes => new PersistentShardCoordinator.GracefulShutdownRequest(ActorRefMessageFromBinary(bytes)) },
+
+                {GetShardStatsManifest, bytes => Shard.GetShardStats.Instance },
+                {ShardStatsManifest, bytes => ShardStatsFromBinary(bytes)}
+            };
+        }
+
+        public override int Identifier { get { return _identifier; } }
+
+        public override byte[] ToBinary(object obj)
+        {
+            if (obj is PersistentShardCoordinator.State) return Compress(CoordinatorStateToProto((PersistentShardCoordinator.State)obj));
+            if (obj is PersistentShardCoordinator.ShardRegionRegistered) return ActorRefMessageToProto(((PersistentShardCoordinator.ShardRegionRegistered)obj).Region).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardRegionProxyRegistered) return ActorRefMessageToProto(((PersistentShardCoordinator.ShardRegionProxyRegistered)obj).RegionProxy).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardRegionTerminated) return ActorRefMessageToProto(((PersistentShardCoordinator.ShardRegionTerminated)obj).Region).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardRegionProxyTerminated) return ActorRefMessageToProto(((PersistentShardCoordinator.ShardRegionProxyTerminated)obj).RegionProxy).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardHomeAllocated) return ShardHomeAllocatedToProto((PersistentShardCoordinator.ShardHomeAllocated)obj).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardHomeDeallocated) return ShardIdMessageToProto(((PersistentShardCoordinator.ShardHomeDeallocated)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.Register) return ActorRefMessageToProto(((PersistentShardCoordinator.Register)obj).ShardRegion).ToByteArray();
+            if (obj is PersistentShardCoordinator.RegisterProxy) return ActorRefMessageToProto(((PersistentShardCoordinator.RegisterProxy)obj).ShardRegionProxy).ToByteArray();
+            if (obj is PersistentShardCoordinator.RegisterAck) return ActorRefMessageToProto(((PersistentShardCoordinator.RegisterAck)obj).Coordinator).ToByteArray();
+            if (obj is PersistentShardCoordinator.GetShardHome) return ShardIdMessageToProto(((PersistentShardCoordinator.GetShardHome)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardHome) return ShardHomeToProto((PersistentShardCoordinator.ShardHome)obj).ToByteArray();
+            if (obj is PersistentShardCoordinator.HostShard) return ShardIdMessageToProto(((PersistentShardCoordinator.HostShard)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardStarted) return ShardIdMessageToProto(((PersistentShardCoordinator.ShardStarted)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.BeginHandOff) return ShardIdMessageToProto(((PersistentShardCoordinator.BeginHandOff)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.BeginHandOffAck) return ShardIdMessageToProto(((PersistentShardCoordinator.BeginHandOffAck)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.HandOff) return ShardIdMessageToProto(((PersistentShardCoordinator.HandOff)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.ShardStopped) return ShardIdMessageToProto(((PersistentShardCoordinator.ShardStopped)obj).Shard).ToByteArray();
+            if (obj is PersistentShardCoordinator.GracefulShutdownRequest) return ActorRefMessageToProto(((PersistentShardCoordinator.GracefulShutdownRequest)obj).ShardRegion).ToByteArray();
+            if (obj is Shard.ShardState) return EntityStateToProto((Shard.ShardState)obj).ToByteArray();
+            if (obj is Shard.EntityStarted) return EntityStartedToProto((Shard.EntityStarted)obj).ToByteArray();
+            if (obj is Shard.EntityStopped) return EntityStoppedToProto((Shard.EntityStopped)obj).ToByteArray();
+            if (obj is Shard.GetShardStats) return new byte[0];
+            if (obj is Shard.ShardStats) return ShardStatsToProto((Shard.ShardStats)obj).ToByteArray();
+
+            throw new ArgumentException(string.Format("Can't serialize object of type [{0}] in [{1}]", obj.GetType(), this.GetType()));
+        }
+
+        public override object FromBinary(byte[] binary, string manifest)
+        {
+            Func<byte[], object> factory;
+            if (_fromBinaryMap.TryGetValue(manifest, out factory))
+            {
+                return factory(binary);
+            }
+
+            throw new ArgumentException(string.Format("Unimplemented deserialization of message with manifest [{0}] in [{1}]", manifest, this.GetType()));
+        }
+
+        public override string Manifest(object o)
+        {
+            if (o is EntityState) return EntityStateManifest;
+            if (o is EntityStarted) return EntityStartedManifest;
+            if (o is EntityStopped) return EntityStoppedManifest;
+            if (o is PersistentShardCoordinator.State) return CoordinatorStateManifest;
+            if (o is PersistentShardCoordinator.ShardRegionRegistered) return ShardRegionRegisteredManifest;
+            if (o is PersistentShardCoordinator.ShardRegionProxyRegistered) return ShardRegionProxyRegisteredManifest;
+            if (o is PersistentShardCoordinator.ShardRegionTerminated) return ShardRegionTerminatedManifest;
+            if (o is PersistentShardCoordinator.ShardRegionProxyTerminated) return ShardRegionProxyTerminatedManifest;
+            if (o is ShardHomeAllocated) return ShardHomeAllocatedManifest;
+            if (o is PersistentShardCoordinator.ShardHomeDeallocated) return ShardHomeDeallocatedManifest;
+            if (o is PersistentShardCoordinator.Register) return RegisterManifest;
+            if (o is PersistentShardCoordinator.RegisterProxy) return RegisterProxyManifest;
+            if (o is PersistentShardCoordinator.RegisterAck) return RegisterAckManifest;
+            if (o is PersistentShardCoordinator.GetShardHome) return GetShardHomeManifest;
+            if (o is ShardHome) return ShardHomeManifest;
+            if (o is PersistentShardCoordinator.HostShard) return HostShardManifest;
+            if (o is PersistentShardCoordinator.ShardStarted) return ShardStartedManifest;
+            if (o is PersistentShardCoordinator.BeginHandOff) return BeginHandOffManifest;
+            if (o is PersistentShardCoordinator.BeginHandOffAck) return BeginHandOffAckManifest;
+            if (o is PersistentShardCoordinator.HandOff) return HandOffManifest;
+            if (o is PersistentShardCoordinator.ShardStopped) return ShardStoppedManifest;
+            if (o is PersistentShardCoordinator.GracefulShutdownRequest) return GracefulShutdownReqManifest;
+            if (o is Shard.GetShardStats) return GetShardStatsManifest;
+            if (o is Shard.ShardStats) return ShardStatsManifest;
+
+            throw new ArgumentException(string.Format("Can't serialize object of type [{0}] in [{1}]", o.GetType(), this.GetType()));
+        }
+
+        private ShardStats ShardStatsToProto(Shard.ShardStats o)
+        {
+            return ShardStats.CreateBuilder().SetShard(o.ShardId).SetEntityCount(o.EntityCount).Build();
+        }
+
+        private EntityStopped EntityStoppedToProto(Shard.EntityStopped entityStopped)
+        {
+            return EntityStopped.CreateBuilder().SetEntityId(entityStopped.EntityId).Build();
+        }
+
+        private EntityStarted EntityStartedToProto(Shard.EntityStarted entityStarted)
+        {
+            return EntityStarted.CreateBuilder().SetEntityId(entityStarted.EntityId).Build();
+        }
+
+        private EntityState EntityStateToProto(Shard.ShardState entityState)
+        {
+            return EntityState.CreateBuilder().AddRangeEntities(entityState.Entries).Build();
+        }
+
+        private ShardHome ShardHomeToProto(PersistentShardCoordinator.ShardHome shardHome)
+        {
+            return ShardHome.CreateBuilder()
+                .SetShard(shardHome.Shard)
+                .SetRegion(Akka.Serialization.Serialization.SerializedActorPath(shardHome.Ref))
+                .Build();
+        }
+
+        private ShardHomeAllocated ShardHomeAllocatedToProto(PersistentShardCoordinator.ShardHomeAllocated shardHomeAllocated)
+        {
+            return ShardHomeAllocated.CreateBuilder()
+                .SetShard(shardHomeAllocated.Shard)
+                .SetRegion(Akka.Serialization.Serialization.SerializedActorPath(shardHomeAllocated.Region))
+                .Build();
+        }
+
+        private ShardIdMessage ShardIdMessageToProto(string shard)
+        {
+            return ShardIdMessage.CreateBuilder().SetShard(shard).Build();
+        }
+
+        private ActorRefMessage ActorRefMessageToProto(IActorRef actorRef)
+        {
+            return ActorRefMessage.CreateBuilder().SetRef(Akka.Serialization.Serialization.SerializedActorPath(actorRef)).Build();
+        }
+
+        private CoordinatorState CoordinatorStateToProto(PersistentShardCoordinator.State state)
+        {
+            var builder = CoordinatorState.CreateBuilder()
+                .AddRangeShards(state.Shards.Select(entry => CoordinatorState.Types.ShardEntry.CreateBuilder()
+                    .SetShardId(entry.Key)
+                    .SetRegionRef(Akka.Serialization.Serialization.SerializedActorPath(entry.Value))
+                    .Build()))
+                .AddRangeRegions(state.Regions.Keys.Select(Akka.Serialization.Serialization.SerializedActorPath))
+                .AddRangeRegionProxies(state.RegionProxies.Select(Akka.Serialization.Serialization.SerializedActorPath))
+                .AddRangeUnallocatedShards(state.UnallocatedShards);
+
+            return builder.Build();
+        }
+
+        private string ShardIdMessageFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                return ShardIdMessage.ParseFrom(stream).Shard;
+            }
+        }
+
+        private IActorRef ActorRefMessageFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                return ResolveActorRef(ActorRefMessage.ParseFrom(stream).Ref);
+            }
+        }
+
+        private object ShardStatsFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                return ResolveActorRef(ActorRefMessage.ParseFrom(stream).Ref);
+            }
+        }
+
+        private object ShardHomeFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                var msg = ShardHome.ParseFrom(stream);
+                return new PersistentShardCoordinator.ShardHome(msg.Shard, ResolveActorRef(msg.Region));
+            }
+        }
+
+        private object ShardHomeAllocatedFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                var msg = ShardHomeAllocated.ParseFrom(stream);
+                return new PersistentShardCoordinator.ShardHomeAllocated(msg.Shard, ResolveActorRef(msg.Region));
+            }
+        }
+
+        private object EntityStoppedFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                var msg = EntityStopped.ParseFrom(stream);
+                return new Shard.EntityStopped(msg.EntityId);
+            }
+        }
+
+        private object EntityStartedFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                var msg = EntityStarted.ParseFrom(stream);
+                return new Shard.EntityStarted(msg.EntityId);
+            }
+        }
+
+        private object EntityStateFromBinary(byte[] binary)
+        {
+            using (var stream = new MemoryStream(binary, false))
+            {
+                var msg = EntityState.ParseFrom(stream);
+                return new Shard.ShardState(ImmutableHashSet.CreateRange(msg.EntitiesList));
+            }
+        }
+
+        private object CoordinatorStateFromBinary(byte[] binary)
+        {
+            using (var stream = Decompress(binary))
+            {
+                var state = CoordinatorState.ParseFrom(stream);
+                var shards = ImmutableDictionary.CreateRange(state.ShardsList.Select(entry => new KeyValuePair<string, IActorRef>(entry.ShardId, ResolveActorRef(entry.RegionRef))));
+                var regionsZero = ImmutableDictionary.CreateRange(state.RegionsList.Select(region => new KeyValuePair<IActorRef, IImmutableList<string>>(ResolveActorRef(region), ImmutableList<string>.Empty)));
+                var regions = shards.Aggregate(regionsZero, (acc, entry) => acc.SetItem(entry.Value, acc[entry.Value].Add(entry.Key)));
+                var proxies = state.RegionProxiesList.Select(ResolveActorRef).ToImmutableHashSet();
+                var unallocatedShards = state.UnallocatedShardsList.ToImmutableHashSet();
+
+                return new PersistentShardCoordinator.State(
+                    shards: shards,
+                    regions: regions,
+                    regionProxies: proxies,
+                    unallocatedShards: unallocatedShards);
+            }
+        }
+
+        /// <summary>
+        /// Compresses the protobuf message using GZIP compression
+        /// </summary>
+        private static byte[] Compress(IMessageLite message)
+        {
+            using (var bos = new MemoryStream(BufferSize))
+            using (var gzipStream = new GZipStream(bos, CompressionMode.Compress))
+            {
+                message.WriteTo(gzipStream);
+                gzipStream.Close();
+                return bos.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Decompresses the protobuf message using GZIP compression
+        /// </summary>
+        private static Stream Decompress(byte[] bytes)
+        {
+            return new GZipStream(new MemoryStream(bytes), CompressionMode.Decompress);
+        }
+
+        private IActorRef ResolveActorRef(string path)
+        {
+            return _system.Provider.ResolveActorRef(path);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
index c0ceeec3270..99dcdb7c3b6 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Serialization/Proto/ClusterShardingMessages.cs
@@ -1,4 +1,4 @@
-// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589.  DO NOT EDIT!
+// Generated by ProtoGen, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589.  DO NOT EDIT!
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -7,3631 +7,3245 @@
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public static partial class ClusterShardingMessages
-{
-
-    #region Extension registration
-    public static void RegisterAllExtensions(pb::ExtensionRegistry registry)
-    {
-    }
-    #endregion
-    #region Static variables
-    internal static pbd::MessageDescriptor internal__static_CoordinatorState__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::CoordinatorState, global::CoordinatorState.Builder> internal__static_CoordinatorState__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_CoordinatorState_ShardEntry__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::CoordinatorState.Types.ShardEntry, global::CoordinatorState.Types.ShardEntry.Builder> internal__static_CoordinatorState_ShardEntry__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_ActorRefMessage__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::ActorRefMessage, global::ActorRefMessage.Builder> internal__static_ActorRefMessage__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_ShardIdMessage__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::ShardIdMessage, global::ShardIdMessage.Builder> internal__static_ShardIdMessage__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_ShardHomeAllocated__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::ShardHomeAllocated, global::ShardHomeAllocated.Builder> internal__static_ShardHomeAllocated__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_ShardHome__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::ShardHome, global::ShardHome.Builder> internal__static_ShardHome__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_EntityState__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::EntityState, global::EntityState.Builder> internal__static_EntityState__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_EntityStarted__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::EntityStarted, global::EntityStarted.Builder> internal__static_EntityStarted__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_EntityStopped__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::EntityStopped, global::EntityStopped.Builder> internal__static_EntityStopped__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbd::FileDescriptor Descriptor
-    {
-        get { return descriptor; }
-    }
-    private static pbd::FileDescriptor descriptor;
-
-    static ClusterShardingMessages()
-    {
-        byte[] descriptorData = global::System.Convert.FromBase64String(
-            "Ch1DbHVzdGVyU2hhcmRpbmdNZXNzYWdlcy5wcm90byK1AQoQQ29vcmRpbmF0" +
-            "b3JTdGF0ZRIsCgZzaGFyZHMYASADKAsyHC5Db29yZGluYXRvclN0YXRlLlNo" +
-            "YXJkRW50cnkSDwoHcmVnaW9ucxgCIAMoCRIVCg1yZWdpb25Qcm94aWVzGAMg" +
-            "AygJEhkKEXVuYWxsb2NhdGVkU2hhcmRzGAQgAygJGjAKClNoYXJkRW50cnkS" +
-            "DwoHc2hhcmRJZBgBIAIoCRIRCglyZWdpb25SZWYYAiACKAkiHgoPQWN0b3JS" +
-            "ZWZNZXNzYWdlEgsKA3JlZhgBIAIoCSIfCg5TaGFyZElkTWVzc2FnZRINCgVz" +
-            "aGFyZBgBIAIoCSIzChJTaGFyZEhvbWVBbGxvY2F0ZWQSDQoFc2hhcmQYASAC" +
-            "KAkSDgoGcmVnaW9uGAIgAigJIioKCVNoYXJkSG9tZRINCgVzaGFyZBgBIAIo" +
-            "CRIOCgZyZWdpb24YAiACKAkiHwoLRW50aXR5U3RhdGUSEAoIZW50aXRpZXMY" +
-            "ASADKAkiIQoNRW50aXR5U3RhcnRlZBIQCghlbnRpdHlJZBgBIAIoCSIhCg1F" +
-            "bnRpdHlTdG9wcGVkEhAKCGVudGl0eUlkGAEgAigJQiYKImFra2EuY2x1c3Rl" +
-            "ci5zaGFyZGluZy5wcm90b2J1Zi5tc2dIAQ==");
-        pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate (pbd::FileDescriptor root) {
-            descriptor = root;
-            internal__static_CoordinatorState__Descriptor = Descriptor.MessageTypes[0];
-            internal__static_CoordinatorState__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::CoordinatorState, global::CoordinatorState.Builder>(internal__static_CoordinatorState__Descriptor,
-                    new string[] { "Shards", "Regions", "RegionProxies", "UnallocatedShards", });
-            internal__static_CoordinatorState_ShardEntry__Descriptor = internal__static_CoordinatorState__Descriptor.NestedTypes[0];
-            internal__static_CoordinatorState_ShardEntry__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::CoordinatorState.Types.ShardEntry, global::CoordinatorState.Types.ShardEntry.Builder>(internal__static_CoordinatorState_ShardEntry__Descriptor,
-                    new string[] { "ShardId", "RegionRef", });
-            internal__static_ActorRefMessage__Descriptor = Descriptor.MessageTypes[1];
-            internal__static_ActorRefMessage__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::ActorRefMessage, global::ActorRefMessage.Builder>(internal__static_ActorRefMessage__Descriptor,
-                    new string[] { "Ref", });
-            internal__static_ShardIdMessage__Descriptor = Descriptor.MessageTypes[2];
-            internal__static_ShardIdMessage__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::ShardIdMessage, global::ShardIdMessage.Builder>(internal__static_ShardIdMessage__Descriptor,
-                    new string[] { "Shard", });
-            internal__static_ShardHomeAllocated__Descriptor = Descriptor.MessageTypes[3];
-            internal__static_ShardHomeAllocated__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::ShardHomeAllocated, global::ShardHomeAllocated.Builder>(internal__static_ShardHomeAllocated__Descriptor,
-                    new string[] { "Shard", "Region", });
-            internal__static_ShardHome__Descriptor = Descriptor.MessageTypes[4];
-            internal__static_ShardHome__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::ShardHome, global::ShardHome.Builder>(internal__static_ShardHome__Descriptor,
-                    new string[] { "Shard", "Region", });
-            internal__static_EntityState__Descriptor = Descriptor.MessageTypes[5];
-            internal__static_EntityState__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::EntityState, global::EntityState.Builder>(internal__static_EntityState__Descriptor,
-                    new string[] { "Entities", });
-            internal__static_EntityStarted__Descriptor = Descriptor.MessageTypes[6];
-            internal__static_EntityStarted__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::EntityStarted, global::EntityStarted.Builder>(internal__static_EntityStarted__Descriptor,
-                    new string[] { "EntityId", });
-            internal__static_EntityStopped__Descriptor = Descriptor.MessageTypes[7];
-            internal__static_EntityStopped__FieldAccessorTable =
-                new pb::FieldAccess.FieldAccessorTable<global::EntityStopped, global::EntityStopped.Builder>(internal__static_EntityStopped__Descriptor,
-                    new string[] { "EntityId", });
-            return null;
-        };
-        pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-            new pbd::FileDescriptor[] {
-            }, assigner);
-    }
-    #endregion
-
-}
-#region Messages
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class CoordinatorState : pb::GeneratedMessage<CoordinatorState, CoordinatorState.Builder>
-{
-    private CoordinatorState() { }
-    private static readonly CoordinatorState defaultInstance = new CoordinatorState().MakeReadOnly();
-    private static readonly string[] _coordinatorStateFieldNames = new string[] { "regionProxies", "regions", "shards", "unallocatedShards" };
-    private static readonly uint[] _coordinatorStateFieldTags = new uint[] { 26, 18, 10, 34 };
-    public static CoordinatorState DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override CoordinatorState DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override CoordinatorState ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_CoordinatorState__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<CoordinatorState, CoordinatorState.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_CoordinatorState__FieldAccessorTable; }
-    }
-
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types
-    {
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public sealed partial class ShardEntry : pb::GeneratedMessage<ShardEntry, ShardEntry.Builder>
-        {
-            private ShardEntry() { }
-            private static readonly ShardEntry defaultInstance = new ShardEntry().MakeReadOnly();
-            private static readonly string[] _shardEntryFieldNames = new string[] { "regionRef", "shardId" };
-            private static readonly uint[] _shardEntryFieldTags = new uint[] { 18, 10 };
-            public static ShardEntry DefaultInstance
-            {
-                get { return defaultInstance; }
-            }
-
-            public override ShardEntry DefaultInstanceForType
-            {
-                get { return DefaultInstance; }
-            }
-
-            protected override ShardEntry ThisMessage
-            {
-                get { return this; }
-            }
-
-            public static pbd::MessageDescriptor Descriptor
-            {
-                get { return global::ClusterShardingMessages.internal__static_CoordinatorState_ShardEntry__Descriptor; }
-            }
-
-            protected override pb::FieldAccess.FieldAccessorTable<ShardEntry, ShardEntry.Builder> InternalFieldAccessors
-            {
-                get { return global::ClusterShardingMessages.internal__static_CoordinatorState_ShardEntry__FieldAccessorTable; }
-            }
-
-            public const int ShardIdFieldNumber = 1;
-            private bool hasShardId;
-            private string shardId_ = "";
-            public bool HasShardId
-            {
-                get { return hasShardId; }
-            }
-            public string ShardId
-            {
-                get { return shardId_; }
-            }
-
-            public const int RegionRefFieldNumber = 2;
-            private bool hasRegionRef;
-            private string regionRef_ = "";
-            public bool HasRegionRef
-            {
-                get { return hasRegionRef; }
-            }
-            public string RegionRef
-            {
-                get { return regionRef_; }
-            }
-
-            public override bool IsInitialized
-            {
-                get
-                {
-                    if (!hasShardId) return false;
-                    if (!hasRegionRef) return false;
-                    return true;
-                }
-            }
-
-            public override void WriteTo(pb::ICodedOutputStream output)
-            {
-                int size = SerializedSize;
-                string[] field_names = _shardEntryFieldNames;
-                if (hasShardId)
-                {
-                    output.WriteString(1, field_names[1], ShardId);
-                }
-                if (hasRegionRef)
-                {
-                    output.WriteString(2, field_names[0], RegionRef);
-                }
-                UnknownFields.WriteTo(output);
-            }
-
-            private int memoizedSerializedSize = -1;
-            public override int SerializedSize
-            {
-                get
-                {
-                    int size = memoizedSerializedSize;
-                    if (size != -1) return size;
-
-                    size = 0;
-                    if (hasShardId)
-                    {
-                        size += pb::CodedOutputStream.ComputeStringSize(1, ShardId);
-                    }
-                    if (hasRegionRef)
-                    {
-                        size += pb::CodedOutputStream.ComputeStringSize(2, RegionRef);
-                    }
-                    size += UnknownFields.SerializedSize;
-                    memoizedSerializedSize = size;
-                    return size;
-                }
-            }
-
-            public static ShardEntry ParseFrom(pb::ByteString data)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(byte[] data)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(global::System.IO.Stream input)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-            }
-            public static ShardEntry ParseDelimitedFrom(global::System.IO.Stream input)
-            {
-                return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-            }
-            public static ShardEntry ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-            {
-                return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(pb::ICodedInputStream input)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-            }
-            public static ShardEntry ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-            {
-                return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-            }
-            private ShardEntry MakeReadOnly()
-            {
-                return this;
-            }
-
-            public static Builder CreateBuilder() { return new Builder(); }
-            public override Builder ToBuilder() { return CreateBuilder(this); }
-            public override Builder CreateBuilderForType() { return new Builder(); }
-            public static Builder CreateBuilder(ShardEntry prototype)
-            {
-                return new Builder(prototype);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            public sealed partial class Builder : pb::GeneratedBuilder<ShardEntry, Builder>
-            {
-                protected override Builder ThisBuilder
-                {
-                    get { return this; }
-                }
-                public Builder()
-                {
-                    result = DefaultInstance;
-                    resultIsReadOnly = true;
-                }
-                internal Builder(ShardEntry cloneFrom)
-                {
-                    result = cloneFrom;
-                    resultIsReadOnly = true;
-                }
-
-                private bool resultIsReadOnly;
-                private ShardEntry result;
-
-                private ShardEntry PrepareBuilder()
-                {
-                    if (resultIsReadOnly)
-                    {
-                        ShardEntry original = result;
-                        result = new ShardEntry();
-                        resultIsReadOnly = false;
-                        MergeFrom(original);
-                    }
-                    return result;
-                }
-
-                public override bool IsInitialized
-                {
-                    get { return result.IsInitialized; }
-                }
-
-                protected override ShardEntry MessageBeingBuilt
-                {
-                    get { return PrepareBuilder(); }
-                }
-
-                public override Builder Clear()
-                {
-                    result = DefaultInstance;
-                    resultIsReadOnly = true;
-                    return this;
-                }
-
-                public override Builder Clone()
-                {
-                    if (resultIsReadOnly)
-                    {
-                        return new Builder(result);
-                    }
-                    else
-                    {
-                        return new Builder().MergeFrom(result);
-                    }
-                }
-
-                public override pbd::MessageDescriptor DescriptorForType
-                {
-                    get { return global::CoordinatorState.Types.ShardEntry.Descriptor; }
-                }
-
-                public override ShardEntry DefaultInstanceForType
-                {
-                    get { return global::CoordinatorState.Types.ShardEntry.DefaultInstance; }
-                }
-
-                public override ShardEntry BuildPartial()
-                {
-                    if (resultIsReadOnly)
-                    {
-                        return result;
-                    }
-                    resultIsReadOnly = true;
-                    return result.MakeReadOnly();
-                }
-
-                public override Builder MergeFrom(pb::IMessage other)
-                {
-                    if (other is ShardEntry)
-                    {
-                        return MergeFrom((ShardEntry)other);
-                    }
-                    else
-                    {
-                        base.MergeFrom(other);
-                        return this;
-                    }
-                }
-
-                public override Builder MergeFrom(ShardEntry other)
-                {
-                    if (other == global::CoordinatorState.Types.ShardEntry.DefaultInstance) return this;
-                    PrepareBuilder();
-                    if (other.HasShardId)
-                    {
-                        ShardId = other.ShardId;
-                    }
-                    if (other.HasRegionRef)
-                    {
-                        RegionRef = other.RegionRef;
-                    }
-                    this.MergeUnknownFields(other.UnknownFields);
-                    return this;
-                }
-
-                public override Builder MergeFrom(pb::ICodedInputStream input)
-                {
-                    return MergeFrom(input, pb::ExtensionRegistry.Empty);
-                }
-
-                public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-                {
-                    PrepareBuilder();
-                    pb::UnknownFieldSet.Builder unknownFields = null;
-                    uint tag;
-                    string field_name;
-                    while (input.ReadTag(out tag, out field_name))
-                    {
-                        if (tag == 0 && field_name != null)
-                        {
-                            int field_ordinal = global::System.Array.BinarySearch(_shardEntryFieldNames, field_name, global::System.StringComparer.Ordinal);
-                            if (field_ordinal >= 0)
-                                tag = _shardEntryFieldTags[field_ordinal];
-                            else
-                            {
-                                if (unknownFields == null)
-                                {
-                                    unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                                }
-                                ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                                continue;
-                            }
-                        }
-                        switch (tag)
-                        {
-                            case 0:
-                                {
-                                    throw pb::InvalidProtocolBufferException.InvalidTag();
-                                }
-                            default:
-                                {
-                                    if (pb::WireFormat.IsEndGroupTag(tag))
-                                    {
-                                        if (unknownFields != null)
-                                        {
-                                            this.UnknownFields = unknownFields.Build();
-                                        }
-                                        return this;
-                                    }
-                                    if (unknownFields == null)
-                                    {
-                                        unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                                    }
-                                    ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                                    break;
-                                }
-                            case 10:
-                                {
-                                    result.hasShardId = input.ReadString(ref result.shardId_);
-                                    break;
-                                }
-                            case 18:
-                                {
-                                    result.hasRegionRef = input.ReadString(ref result.regionRef_);
-                                    break;
-                                }
-                        }
-                    }
-
-                    if (unknownFields != null)
-                    {
-                        this.UnknownFields = unknownFields.Build();
-                    }
-                    return this;
-                }
-
-
-                public bool HasShardId
-                {
-                    get { return result.hasShardId; }
-                }
-                public string ShardId
-                {
-                    get { return result.ShardId; }
-                    set { SetShardId(value); }
-                }
-                public Builder SetShardId(string value)
-                {
-                    pb::ThrowHelper.ThrowIfNull(value, "value");
-                    PrepareBuilder();
-                    result.hasShardId = true;
-                    result.shardId_ = value;
-                    return this;
-                }
-                public Builder ClearShardId()
-                {
-                    PrepareBuilder();
-                    result.hasShardId = false;
-                    result.shardId_ = "";
-                    return this;
-                }
-
-                public bool HasRegionRef
-                {
-                    get { return result.hasRegionRef; }
-                }
-                public string RegionRef
-                {
-                    get { return result.RegionRef; }
-                    set { SetRegionRef(value); }
-                }
-                public Builder SetRegionRef(string value)
-                {
-                    pb::ThrowHelper.ThrowIfNull(value, "value");
-                    PrepareBuilder();
-                    result.hasRegionRef = true;
-                    result.regionRef_ = value;
-                    return this;
-                }
-                public Builder ClearRegionRef()
-                {
-                    PrepareBuilder();
-                    result.hasRegionRef = false;
-                    result.regionRef_ = "";
-                    return this;
-                }
-            }
-            static ShardEntry()
-            {
-                object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-            }
-        }
-
-    }
-    #endregion
-
-    public const int ShardsFieldNumber = 1;
-    private pbc::PopsicleList<global::CoordinatorState.Types.ShardEntry> shards_ = new pbc::PopsicleList<global::CoordinatorState.Types.ShardEntry>();
-    public scg::IList<global::CoordinatorState.Types.ShardEntry> ShardsList
-    {
-        get { return shards_; }
-    }
-    public int ShardsCount
-    {
-        get { return shards_.Count; }
-    }
-    public global::CoordinatorState.Types.ShardEntry GetShards(int index)
-    {
-        return shards_[index];
-    }
-
-    public const int RegionsFieldNumber = 2;
-    private pbc::PopsicleList<string> regions_ = new pbc::PopsicleList<string>();
-    public scg::IList<string> RegionsList
-    {
-        get { return pbc::Lists.AsReadOnly(regions_); }
-    }
-    public int RegionsCount
-    {
-        get { return regions_.Count; }
-    }
-    public string GetRegions(int index)
-    {
-        return regions_[index];
-    }
-
-    public const int RegionProxiesFieldNumber = 3;
-    private pbc::PopsicleList<string> regionProxies_ = new pbc::PopsicleList<string>();
-    public scg::IList<string> RegionProxiesList
-    {
-        get { return pbc::Lists.AsReadOnly(regionProxies_); }
-    }
-    public int RegionProxiesCount
-    {
-        get { return regionProxies_.Count; }
-    }
-    public string GetRegionProxies(int index)
-    {
-        return regionProxies_[index];
-    }
-
-    public const int UnallocatedShardsFieldNumber = 4;
-    private pbc::PopsicleList<string> unallocatedShards_ = new pbc::PopsicleList<string>();
-    public scg::IList<string> UnallocatedShardsList
-    {
-        get { return pbc::Lists.AsReadOnly(unallocatedShards_); }
-    }
-    public int UnallocatedShardsCount
-    {
-        get { return unallocatedShards_.Count; }
-    }
-    public string GetUnallocatedShards(int index)
-    {
-        return unallocatedShards_[index];
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            foreach (global::CoordinatorState.Types.ShardEntry element in ShardsList)
-            {
-                if (!element.IsInitialized) return false;
-            }
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _coordinatorStateFieldNames;
-        if (shards_.Count > 0)
-        {
-            output.WriteMessageArray(1, field_names[2], shards_);
-        }
-        if (regions_.Count > 0)
-        {
-            output.WriteStringArray(2, field_names[1], regions_);
-        }
-        if (regionProxies_.Count > 0)
-        {
-            output.WriteStringArray(3, field_names[0], regionProxies_);
-        }
-        if (unallocatedShards_.Count > 0)
-        {
-            output.WriteStringArray(4, field_names[3], unallocatedShards_);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            foreach (global::CoordinatorState.Types.ShardEntry element in ShardsList)
-            {
-                size += pb::CodedOutputStream.ComputeMessageSize(1, element);
-            }
-            {
-                int dataSize = 0;
-                foreach (string element in RegionsList)
-                {
-                    dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
-                }
-                size += dataSize;
-                size += 1 * regions_.Count;
-            }
-            {
-                int dataSize = 0;
-                foreach (string element in RegionProxiesList)
-                {
-                    dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
-                }
-                size += dataSize;
-                size += 1 * regionProxies_.Count;
-            }
-            {
-                int dataSize = 0;
-                foreach (string element in UnallocatedShardsList)
-                {
-                    dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
-                }
-                size += dataSize;
-                size += 1 * unallocatedShards_.Count;
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static CoordinatorState ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static CoordinatorState ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static CoordinatorState ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CoordinatorState ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private CoordinatorState MakeReadOnly()
-    {
-        shards_.MakeReadOnly();
-        regions_.MakeReadOnly();
-        regionProxies_.MakeReadOnly();
-        unallocatedShards_.MakeReadOnly();
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(CoordinatorState prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<CoordinatorState, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(CoordinatorState cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private CoordinatorState result;
-
-        private CoordinatorState PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                CoordinatorState original = result;
-                result = new CoordinatorState();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override CoordinatorState MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::CoordinatorState.Descriptor; }
-        }
-
-        public override CoordinatorState DefaultInstanceForType
-        {
-            get { return global::CoordinatorState.DefaultInstance; }
-        }
-
-        public override CoordinatorState BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is CoordinatorState)
-            {
-                return MergeFrom((CoordinatorState)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(CoordinatorState other)
-        {
-            if (other == global::CoordinatorState.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.shards_.Count != 0)
-            {
-                result.shards_.Add(other.shards_);
-            }
-            if (other.regions_.Count != 0)
-            {
-                result.regions_.Add(other.regions_);
-            }
-            if (other.regionProxies_.Count != 0)
-            {
-                result.regionProxies_.Add(other.regionProxies_);
-            }
-            if (other.unallocatedShards_.Count != 0)
-            {
-                result.unallocatedShards_.Add(other.unallocatedShards_);
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_coordinatorStateFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _coordinatorStateFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            input.ReadMessageArray(tag, field_name, result.shards_, global::CoordinatorState.Types.ShardEntry.DefaultInstance, extensionRegistry);
-                            break;
-                        }
-                    case 18:
-                        {
-                            input.ReadStringArray(tag, field_name, result.regions_);
-                            break;
-                        }
-                    case 26:
-                        {
-                            input.ReadStringArray(tag, field_name, result.regionProxies_);
-                            break;
-                        }
-                    case 34:
-                        {
-                            input.ReadStringArray(tag, field_name, result.unallocatedShards_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public pbc::IPopsicleList<global::CoordinatorState.Types.ShardEntry> ShardsList
-        {
-            get { return PrepareBuilder().shards_; }
-        }
-        public int ShardsCount
-        {
-            get { return result.ShardsCount; }
-        }
-        public global::CoordinatorState.Types.ShardEntry GetShards(int index)
-        {
-            return result.GetShards(index);
-        }
-        public Builder SetShards(int index, global::CoordinatorState.Types.ShardEntry value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.shards_[index] = value;
-            return this;
-        }
-        public Builder SetShards(int index, global::CoordinatorState.Types.ShardEntry.Builder builderForValue)
-        {
-            pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
-            PrepareBuilder();
-            result.shards_[index] = builderForValue.Build();
-            return this;
-        }
-        public Builder AddShards(global::CoordinatorState.Types.ShardEntry value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.shards_.Add(value);
-            return this;
-        }
-        public Builder AddShards(global::CoordinatorState.Types.ShardEntry.Builder builderForValue)
-        {
-            pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
-            PrepareBuilder();
-            result.shards_.Add(builderForValue.Build());
-            return this;
-        }
-        public Builder AddRangeShards(scg::IEnumerable<global::CoordinatorState.Types.ShardEntry> values)
-        {
-            PrepareBuilder();
-            result.shards_.Add(values);
-            return this;
-        }
-        public Builder ClearShards()
-        {
-            PrepareBuilder();
-            result.shards_.Clear();
-            return this;
-        }
-
-        public pbc::IPopsicleList<string> RegionsList
-        {
-            get { return PrepareBuilder().regions_; }
-        }
-        public int RegionsCount
-        {
-            get { return result.RegionsCount; }
-        }
-        public string GetRegions(int index)
-        {
-            return result.GetRegions(index);
-        }
-        public Builder SetRegions(int index, string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.regions_[index] = value;
-            return this;
-        }
-        public Builder AddRegions(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.regions_.Add(value);
-            return this;
-        }
-        public Builder AddRangeRegions(scg::IEnumerable<string> values)
-        {
-            PrepareBuilder();
-            result.regions_.Add(values);
-            return this;
-        }
-        public Builder ClearRegions()
-        {
-            PrepareBuilder();
-            result.regions_.Clear();
-            return this;
-        }
-
-        public pbc::IPopsicleList<string> RegionProxiesList
-        {
-            get { return PrepareBuilder().regionProxies_; }
-        }
-        public int RegionProxiesCount
-        {
-            get { return result.RegionProxiesCount; }
-        }
-        public string GetRegionProxies(int index)
-        {
-            return result.GetRegionProxies(index);
-        }
-        public Builder SetRegionProxies(int index, string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.regionProxies_[index] = value;
-            return this;
-        }
-        public Builder AddRegionProxies(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.regionProxies_.Add(value);
-            return this;
-        }
-        public Builder AddRangeRegionProxies(scg::IEnumerable<string> values)
-        {
-            PrepareBuilder();
-            result.regionProxies_.Add(values);
-            return this;
-        }
-        public Builder ClearRegionProxies()
-        {
-            PrepareBuilder();
-            result.regionProxies_.Clear();
-            return this;
-        }
-
-        public pbc::IPopsicleList<string> UnallocatedShardsList
-        {
-            get { return PrepareBuilder().unallocatedShards_; }
-        }
-        public int UnallocatedShardsCount
-        {
-            get { return result.UnallocatedShardsCount; }
-        }
-        public string GetUnallocatedShards(int index)
-        {
-            return result.GetUnallocatedShards(index);
-        }
-        public Builder SetUnallocatedShards(int index, string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.unallocatedShards_[index] = value;
-            return this;
-        }
-        public Builder AddUnallocatedShards(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.unallocatedShards_.Add(value);
-            return this;
-        }
-        public Builder AddRangeUnallocatedShards(scg::IEnumerable<string> values)
-        {
-            PrepareBuilder();
-            result.unallocatedShards_.Add(values);
-            return this;
-        }
-        public Builder ClearUnallocatedShards()
-        {
-            PrepareBuilder();
-            result.unallocatedShards_.Clear();
-            return this;
-        }
-    }
-    static CoordinatorState()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
-}
-
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class ActorRefMessage : pb::GeneratedMessage<ActorRefMessage, ActorRefMessage.Builder>
-{
-    private ActorRefMessage() { }
-    private static readonly ActorRefMessage defaultInstance = new ActorRefMessage().MakeReadOnly();
-    private static readonly string[] _actorRefMessageFieldNames = new string[] { "ref" };
-    private static readonly uint[] _actorRefMessageFieldTags = new uint[] { 10 };
-    public static ActorRefMessage DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override ActorRefMessage DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override ActorRefMessage ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_ActorRefMessage__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<ActorRefMessage, ActorRefMessage.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_ActorRefMessage__FieldAccessorTable; }
-    }
-
-    public const int RefFieldNumber = 1;
-    private bool hasRef;
-    private string ref_ = "";
-    public bool HasRef
-    {
-        get { return hasRef; }
-    }
-    public string Ref
-    {
-        get { return ref_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasRef) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _actorRefMessageFieldNames;
-        if (hasRef)
-        {
-            output.WriteString(1, field_names[0], Ref);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasRef)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, Ref);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static ActorRefMessage ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static ActorRefMessage ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static ActorRefMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ActorRefMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private ActorRefMessage MakeReadOnly()
-    {
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(ActorRefMessage prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<ActorRefMessage, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(ActorRefMessage cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private ActorRefMessage result;
-
-        private ActorRefMessage PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                ActorRefMessage original = result;
-                result = new ActorRefMessage();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override ActorRefMessage MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::ActorRefMessage.Descriptor; }
-        }
-
-        public override ActorRefMessage DefaultInstanceForType
-        {
-            get { return global::ActorRefMessage.DefaultInstance; }
-        }
-
-        public override ActorRefMessage BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is ActorRefMessage)
-            {
-                return MergeFrom((ActorRefMessage)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(ActorRefMessage other)
-        {
-            if (other == global::ActorRefMessage.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasRef)
-            {
-                Ref = other.Ref;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_actorRefMessageFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _actorRefMessageFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasRef = input.ReadString(ref result.ref_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public bool HasRef
-        {
-            get { return result.hasRef; }
-        }
-        public string Ref
-        {
-            get { return result.Ref; }
-            set { SetRef(value); }
-        }
-        public Builder SetRef(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasRef = true;
-            result.ref_ = value;
-            return this;
-        }
-        public Builder ClearRef()
-        {
-            PrepareBuilder();
-            result.hasRef = false;
-            result.ref_ = "";
-            return this;
-        }
-    }
-    static ActorRefMessage()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
-}
-
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class ShardIdMessage : pb::GeneratedMessage<ShardIdMessage, ShardIdMessage.Builder>
-{
-    private ShardIdMessage() { }
-    private static readonly ShardIdMessage defaultInstance = new ShardIdMessage().MakeReadOnly();
-    private static readonly string[] _shardIdMessageFieldNames = new string[] { "shard" };
-    private static readonly uint[] _shardIdMessageFieldTags = new uint[] { 10 };
-    public static ShardIdMessage DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override ShardIdMessage DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override ShardIdMessage ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardIdMessage__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<ShardIdMessage, ShardIdMessage.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardIdMessage__FieldAccessorTable; }
-    }
-
-    public const int ShardFieldNumber = 1;
-    private bool hasShard;
-    private string shard_ = "";
-    public bool HasShard
-    {
-        get { return hasShard; }
-    }
-    public string Shard
-    {
-        get { return shard_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasShard) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _shardIdMessageFieldNames;
-        if (hasShard)
-        {
-            output.WriteString(1, field_names[0], Shard);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasShard)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static ShardIdMessage ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static ShardIdMessage ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static ShardIdMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardIdMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private ShardIdMessage MakeReadOnly()
-    {
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(ShardIdMessage prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<ShardIdMessage, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(ShardIdMessage cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private ShardIdMessage result;
-
-        private ShardIdMessage PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                ShardIdMessage original = result;
-                result = new ShardIdMessage();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override ShardIdMessage MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::ShardIdMessage.Descriptor; }
-        }
-
-        public override ShardIdMessage DefaultInstanceForType
-        {
-            get { return global::ShardIdMessage.DefaultInstance; }
-        }
-
-        public override ShardIdMessage BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is ShardIdMessage)
-            {
-                return MergeFrom((ShardIdMessage)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(ShardIdMessage other)
-        {
-            if (other == global::ShardIdMessage.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasShard)
-            {
-                Shard = other.Shard;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_shardIdMessageFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _shardIdMessageFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasShard = input.ReadString(ref result.shard_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public bool HasShard
-        {
-            get { return result.hasShard; }
-        }
-        public string Shard
-        {
-            get { return result.Shard; }
-            set { SetShard(value); }
-        }
-        public Builder SetShard(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasShard = true;
-            result.shard_ = value;
-            return this;
-        }
-        public Builder ClearShard()
-        {
-            PrepareBuilder();
-            result.hasShard = false;
-            result.shard_ = "";
-            return this;
-        }
-    }
-    static ShardIdMessage()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
-}
-
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class ShardHomeAllocated : pb::GeneratedMessage<ShardHomeAllocated, ShardHomeAllocated.Builder>
-{
-    private ShardHomeAllocated() { }
-    private static readonly ShardHomeAllocated defaultInstance = new ShardHomeAllocated().MakeReadOnly();
-    private static readonly string[] _shardHomeAllocatedFieldNames = new string[] { "region", "shard" };
-    private static readonly uint[] _shardHomeAllocatedFieldTags = new uint[] { 18, 10 };
-    public static ShardHomeAllocated DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override ShardHomeAllocated DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override ShardHomeAllocated ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardHomeAllocated__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<ShardHomeAllocated, ShardHomeAllocated.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardHomeAllocated__FieldAccessorTable; }
-    }
-
-    public const int ShardFieldNumber = 1;
-    private bool hasShard;
-    private string shard_ = "";
-    public bool HasShard
-    {
-        get { return hasShard; }
-    }
-    public string Shard
-    {
-        get { return shard_; }
-    }
-
-    public const int RegionFieldNumber = 2;
-    private bool hasRegion;
-    private string region_ = "";
-    public bool HasRegion
-    {
-        get { return hasRegion; }
-    }
-    public string Region
-    {
-        get { return region_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasShard) return false;
-            if (!hasRegion) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _shardHomeAllocatedFieldNames;
-        if (hasShard)
-        {
-            output.WriteString(1, field_names[1], Shard);
-        }
-        if (hasRegion)
-        {
-            output.WriteString(2, field_names[0], Region);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasShard)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
-            }
-            if (hasRegion)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(2, Region);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static ShardHomeAllocated ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardHomeAllocated ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private ShardHomeAllocated MakeReadOnly()
-    {
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(ShardHomeAllocated prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<ShardHomeAllocated, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(ShardHomeAllocated cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private ShardHomeAllocated result;
-
-        private ShardHomeAllocated PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                ShardHomeAllocated original = result;
-                result = new ShardHomeAllocated();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override ShardHomeAllocated MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::ShardHomeAllocated.Descriptor; }
-        }
-
-        public override ShardHomeAllocated DefaultInstanceForType
-        {
-            get { return global::ShardHomeAllocated.DefaultInstance; }
-        }
-
-        public override ShardHomeAllocated BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is ShardHomeAllocated)
-            {
-                return MergeFrom((ShardHomeAllocated)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(ShardHomeAllocated other)
-        {
-            if (other == global::ShardHomeAllocated.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasShard)
-            {
-                Shard = other.Shard;
-            }
-            if (other.HasRegion)
-            {
-                Region = other.Region;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_shardHomeAllocatedFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _shardHomeAllocatedFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasShard = input.ReadString(ref result.shard_);
-                            break;
-                        }
-                    case 18:
-                        {
-                            result.hasRegion = input.ReadString(ref result.region_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public bool HasShard
-        {
-            get { return result.hasShard; }
-        }
-        public string Shard
-        {
-            get { return result.Shard; }
-            set { SetShard(value); }
-        }
-        public Builder SetShard(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasShard = true;
-            result.shard_ = value;
-            return this;
-        }
-        public Builder ClearShard()
-        {
-            PrepareBuilder();
-            result.hasShard = false;
-            result.shard_ = "";
-            return this;
-        }
-
-        public bool HasRegion
-        {
-            get { return result.hasRegion; }
-        }
-        public string Region
-        {
-            get { return result.Region; }
-            set { SetRegion(value); }
-        }
-        public Builder SetRegion(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasRegion = true;
-            result.region_ = value;
-            return this;
-        }
-        public Builder ClearRegion()
-        {
-            PrepareBuilder();
-            result.hasRegion = false;
-            result.region_ = "";
-            return this;
-        }
-    }
-    static ShardHomeAllocated()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
-}
-
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class ShardHome : pb::GeneratedMessage<ShardHome, ShardHome.Builder>
-{
-    private ShardHome() { }
-    private static readonly ShardHome defaultInstance = new ShardHome().MakeReadOnly();
-    private static readonly string[] _shardHomeFieldNames = new string[] { "region", "shard" };
-    private static readonly uint[] _shardHomeFieldTags = new uint[] { 18, 10 };
-    public static ShardHome DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override ShardHome DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override ShardHome ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardHome__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<ShardHome, ShardHome.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_ShardHome__FieldAccessorTable; }
-    }
-
-    public const int ShardFieldNumber = 1;
-    private bool hasShard;
-    private string shard_ = "";
-    public bool HasShard
-    {
-        get { return hasShard; }
-    }
-    public string Shard
-    {
-        get { return shard_; }
-    }
-
-    public const int RegionFieldNumber = 2;
-    private bool hasRegion;
-    private string region_ = "";
-    public bool HasRegion
-    {
-        get { return hasRegion; }
-    }
-    public string Region
-    {
-        get { return region_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasShard) return false;
-            if (!hasRegion) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _shardHomeFieldNames;
-        if (hasShard)
-        {
-            output.WriteString(1, field_names[1], Shard);
-        }
-        if (hasRegion)
-        {
-            output.WriteString(2, field_names[0], Region);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasShard)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
-            }
-            if (hasRegion)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(2, Region);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static ShardHome ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static ShardHome ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static ShardHome ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static ShardHome ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static ShardHome ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private ShardHome MakeReadOnly()
-    {
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(ShardHome prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<ShardHome, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(ShardHome cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private ShardHome result;
-
-        private ShardHome PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                ShardHome original = result;
-                result = new ShardHome();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override ShardHome MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::ShardHome.Descriptor; }
-        }
-
-        public override ShardHome DefaultInstanceForType
-        {
-            get { return global::ShardHome.DefaultInstance; }
-        }
-
-        public override ShardHome BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is ShardHome)
-            {
-                return MergeFrom((ShardHome)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(ShardHome other)
-        {
-            if (other == global::ShardHome.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasShard)
-            {
-                Shard = other.Shard;
-            }
-            if (other.HasRegion)
-            {
-                Region = other.Region;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_shardHomeFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _shardHomeFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasShard = input.ReadString(ref result.shard_);
-                            break;
-                        }
-                    case 18:
-                        {
-                            result.hasRegion = input.ReadString(ref result.region_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public bool HasShard
-        {
-            get { return result.hasShard; }
-        }
-        public string Shard
-        {
-            get { return result.Shard; }
-            set { SetShard(value); }
-        }
-        public Builder SetShard(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasShard = true;
-            result.shard_ = value;
-            return this;
-        }
-        public Builder ClearShard()
-        {
-            PrepareBuilder();
-            result.hasShard = false;
-            result.shard_ = "";
-            return this;
-        }
-
-        public bool HasRegion
-        {
-            get { return result.hasRegion; }
-        }
-        public string Region
-        {
-            get { return result.Region; }
-            set { SetRegion(value); }
-        }
-        public Builder SetRegion(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasRegion = true;
-            result.region_ = value;
-            return this;
-        }
-        public Builder ClearRegion()
-        {
-            PrepareBuilder();
-            result.hasRegion = false;
-            result.region_ = "";
-            return this;
-        }
-    }
-    static ShardHome()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
-}
-
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class EntityState : pb::GeneratedMessage<EntityState, EntityState.Builder>
-{
-    private EntityState() { }
-    private static readonly EntityState defaultInstance = new EntityState().MakeReadOnly();
-    private static readonly string[] _entityStateFieldNames = new string[] { "entities" };
-    private static readonly uint[] _entityStateFieldTags = new uint[] { 10 };
-    public static EntityState DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override EntityState DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override EntityState ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityState__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<EntityState, EntityState.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityState__FieldAccessorTable; }
-    }
-
-    public const int EntitiesFieldNumber = 1;
-    private pbc::PopsicleList<string> entities_ = new pbc::PopsicleList<string>();
-    public scg::IList<string> EntitiesList
-    {
-        get { return pbc::Lists.AsReadOnly(entities_); }
-    }
-    public int EntitiesCount
-    {
-        get { return entities_.Count; }
-    }
-    public string GetEntities(int index)
-    {
-        return entities_[index];
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _entityStateFieldNames;
-        if (entities_.Count > 0)
-        {
-            output.WriteStringArray(1, field_names[0], entities_);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            {
-                int dataSize = 0;
-                foreach (string element in EntitiesList)
-                {
-                    dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
-                }
-                size += dataSize;
-                size += 1 * entities_.Count;
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static EntityState ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityState ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityState ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityState ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityState ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityState ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static EntityState ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static EntityState ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static EntityState ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityState ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private EntityState MakeReadOnly()
-    {
-        entities_.MakeReadOnly();
-        return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(EntityState prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<EntityState, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(EntityState cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private EntityState result;
-
-        private EntityState PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                EntityState original = result;
-                result = new EntityState();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override EntityState MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::EntityState.Descriptor; }
-        }
-
-        public override EntityState DefaultInstanceForType
-        {
-            get { return global::EntityState.DefaultInstance; }
-        }
-
-        public override EntityState BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is EntityState)
-            {
-                return MergeFrom((EntityState)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(EntityState other)
-        {
-            if (other == global::EntityState.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.entities_.Count != 0)
-            {
-                result.entities_.Add(other.entities_);
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_entityStateFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _entityStateFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            input.ReadStringArray(tag, field_name, result.entities_);
-                            break;
-                        }
-                }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public pbc::IPopsicleList<string> EntitiesList
-        {
-            get { return PrepareBuilder().entities_; }
-        }
-        public int EntitiesCount
-        {
-            get { return result.EntitiesCount; }
-        }
-        public string GetEntities(int index)
-        {
-            return result.GetEntities(index);
-        }
-        public Builder SetEntities(int index, string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.entities_[index] = value;
-            return this;
-        }
-        public Builder AddEntities(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.entities_.Add(value);
-            return this;
-        }
-        public Builder AddRangeEntities(scg::IEnumerable<string> values)
-        {
-            PrepareBuilder();
-            result.entities_.Add(values);
-            return this;
-        }
-        public Builder ClearEntities()
-        {
-            PrepareBuilder();
-            result.entities_.Clear();
-            return this;
-        }
-    }
-    static EntityState()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
+public static partial class ClusterShardingMessages {
+
+  #region Extension registration
+  public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+  }
+  #endregion
+  #region Static variables
+  internal static pbd::MessageDescriptor internal__static_CoordinatorState__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::CoordinatorState, global::CoordinatorState.Builder> internal__static_CoordinatorState__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_CoordinatorState_ShardEntry__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::CoordinatorState.Types.ShardEntry, global::CoordinatorState.Types.ShardEntry.Builder> internal__static_CoordinatorState_ShardEntry__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_ActorRefMessage__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::ActorRefMessage, global::ActorRefMessage.Builder> internal__static_ActorRefMessage__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_ShardIdMessage__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::ShardIdMessage, global::ShardIdMessage.Builder> internal__static_ShardIdMessage__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_ShardHomeAllocated__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::ShardHomeAllocated, global::ShardHomeAllocated.Builder> internal__static_ShardHomeAllocated__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_ShardHome__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::ShardHome, global::ShardHome.Builder> internal__static_ShardHome__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_EntityState__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::EntityState, global::EntityState.Builder> internal__static_EntityState__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_EntityStarted__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::EntityStarted, global::EntityStarted.Builder> internal__static_EntityStarted__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_EntityStopped__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::EntityStopped, global::EntityStopped.Builder> internal__static_EntityStopped__FieldAccessorTable;
+  internal static pbd::MessageDescriptor internal__static_ShardStats__Descriptor;
+  internal static pb::FieldAccess.FieldAccessorTable<global::ShardStats, global::ShardStats.Builder> internal__static_ShardStats__FieldAccessorTable;
+  #endregion
+  #region Descriptor
+  public static pbd::FileDescriptor Descriptor {
+    get { return descriptor; }
+  }
+  private static pbd::FileDescriptor descriptor;
+  
+  static ClusterShardingMessages() {
+    byte[] descriptorData = global::System.Convert.FromBase64String(
+        "Ch1DbHVzdGVyU2hhcmRpbmdNZXNzYWdlcy5wcm90byK1AQoQQ29vcmRpbmF0" + 
+        "b3JTdGF0ZRIsCgZzaGFyZHMYASADKAsyHC5Db29yZGluYXRvclN0YXRlLlNo" + 
+        "YXJkRW50cnkSDwoHcmVnaW9ucxgCIAMoCRIVCg1yZWdpb25Qcm94aWVzGAMg" + 
+        "AygJEhkKEXVuYWxsb2NhdGVkU2hhcmRzGAQgAygJGjAKClNoYXJkRW50cnkS" + 
+        "DwoHc2hhcmRJZBgBIAIoCRIRCglyZWdpb25SZWYYAiACKAkiHgoPQWN0b3JS" + 
+        "ZWZNZXNzYWdlEgsKA3JlZhgBIAIoCSIfCg5TaGFyZElkTWVzc2FnZRINCgVz" + 
+        "aGFyZBgBIAIoCSIzChJTaGFyZEhvbWVBbGxvY2F0ZWQSDQoFc2hhcmQYASAC" + 
+        "KAkSDgoGcmVnaW9uGAIgAigJIioKCVNoYXJkSG9tZRINCgVzaGFyZBgBIAIo" + 
+        "CRIOCgZyZWdpb24YAiACKAkiHwoLRW50aXR5U3RhdGUSEAoIZW50aXRpZXMY" + 
+        "ASADKAkiIQoNRW50aXR5U3RhcnRlZBIQCghlbnRpdHlJZBgBIAIoCSIhCg1F" + 
+        "bnRpdHlTdG9wcGVkEhAKCGVudGl0eUlkGAEgAigJIjAKClNoYXJkU3RhdHMS" + 
+        "DQoFc2hhcmQYASACKAkSEwoLZW50aXR5Q291bnQYAiACKAVCJgoiYWtrYS5j" + 
+        "bHVzdGVyLnNoYXJkaW5nLnByb3RvYnVmLm1zZ0gB");
+    pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+      descriptor = root;
+      internal__static_CoordinatorState__Descriptor = Descriptor.MessageTypes[0];
+      internal__static_CoordinatorState__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::CoordinatorState, global::CoordinatorState.Builder>(internal__static_CoordinatorState__Descriptor,
+              new string[] { "Shards", "Regions", "RegionProxies", "UnallocatedShards", });
+      internal__static_CoordinatorState_ShardEntry__Descriptor = internal__static_CoordinatorState__Descriptor.NestedTypes[0];
+      internal__static_CoordinatorState_ShardEntry__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::CoordinatorState.Types.ShardEntry, global::CoordinatorState.Types.ShardEntry.Builder>(internal__static_CoordinatorState_ShardEntry__Descriptor,
+              new string[] { "ShardId", "RegionRef", });
+      internal__static_ActorRefMessage__Descriptor = Descriptor.MessageTypes[1];
+      internal__static_ActorRefMessage__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::ActorRefMessage, global::ActorRefMessage.Builder>(internal__static_ActorRefMessage__Descriptor,
+              new string[] { "Ref", });
+      internal__static_ShardIdMessage__Descriptor = Descriptor.MessageTypes[2];
+      internal__static_ShardIdMessage__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::ShardIdMessage, global::ShardIdMessage.Builder>(internal__static_ShardIdMessage__Descriptor,
+              new string[] { "Shard", });
+      internal__static_ShardHomeAllocated__Descriptor = Descriptor.MessageTypes[3];
+      internal__static_ShardHomeAllocated__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::ShardHomeAllocated, global::ShardHomeAllocated.Builder>(internal__static_ShardHomeAllocated__Descriptor,
+              new string[] { "Shard", "Region", });
+      internal__static_ShardHome__Descriptor = Descriptor.MessageTypes[4];
+      internal__static_ShardHome__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::ShardHome, global::ShardHome.Builder>(internal__static_ShardHome__Descriptor,
+              new string[] { "Shard", "Region", });
+      internal__static_EntityState__Descriptor = Descriptor.MessageTypes[5];
+      internal__static_EntityState__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::EntityState, global::EntityState.Builder>(internal__static_EntityState__Descriptor,
+              new string[] { "Entities", });
+      internal__static_EntityStarted__Descriptor = Descriptor.MessageTypes[6];
+      internal__static_EntityStarted__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::EntityStarted, global::EntityStarted.Builder>(internal__static_EntityStarted__Descriptor,
+              new string[] { "EntityId", });
+      internal__static_EntityStopped__Descriptor = Descriptor.MessageTypes[7];
+      internal__static_EntityStopped__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::EntityStopped, global::EntityStopped.Builder>(internal__static_EntityStopped__Descriptor,
+              new string[] { "EntityId", });
+      internal__static_ShardStats__Descriptor = Descriptor.MessageTypes[8];
+      internal__static_ShardStats__FieldAccessorTable = 
+          new pb::FieldAccess.FieldAccessorTable<global::ShardStats, global::ShardStats.Builder>(internal__static_ShardStats__Descriptor,
+              new string[] { "Shard", "EntityCount", });
+      return null;
+    };
+    pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+        new pbd::FileDescriptor[] {
+        }, assigner);
+  }
+  #endregion
+  
 }
-
+#region Messages
 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class EntityStarted : pb::GeneratedMessage<EntityStarted, EntityStarted.Builder>
-{
-    private EntityStarted() { }
-    private static readonly EntityStarted defaultInstance = new EntityStarted().MakeReadOnly();
-    private static readonly string[] _entityStartedFieldNames = new string[] { "entityId" };
-    private static readonly uint[] _entityStartedFieldTags = new uint[] { 10 };
-    public static EntityStarted DefaultInstance
-    {
+public sealed partial class CoordinatorState : pb::GeneratedMessage<CoordinatorState, CoordinatorState.Builder> {
+  private CoordinatorState() { }
+  private static readonly CoordinatorState defaultInstance = new CoordinatorState().MakeReadOnly();
+  private static readonly string[] _coordinatorStateFieldNames = new string[] { "regionProxies", "regions", "shards", "unallocatedShards" };
+  private static readonly uint[] _coordinatorStateFieldTags = new uint[] { 26, 18, 10, 34 };
+  public static CoordinatorState DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override CoordinatorState DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override CoordinatorState ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_CoordinatorState__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<CoordinatorState, CoordinatorState.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_CoordinatorState__FieldAccessorTable; }
+  }
+  
+  #region Nested types
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public static partial class Types {
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    public sealed partial class ShardEntry : pb::GeneratedMessage<ShardEntry, ShardEntry.Builder> {
+      private ShardEntry() { }
+      private static readonly ShardEntry defaultInstance = new ShardEntry().MakeReadOnly();
+      private static readonly string[] _shardEntryFieldNames = new string[] { "regionRef", "shardId" };
+      private static readonly uint[] _shardEntryFieldTags = new uint[] { 18, 10 };
+      public static ShardEntry DefaultInstance {
         get { return defaultInstance; }
-    }
-
-    public override EntityStarted DefaultInstanceForType
-    {
+      }
+      
+      public override ShardEntry DefaultInstanceForType {
         get { return DefaultInstance; }
-    }
-
-    protected override EntityStarted ThisMessage
-    {
+      }
+      
+      protected override ShardEntry ThisMessage {
         get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityStarted__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<EntityStarted, EntityStarted.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityStarted__FieldAccessorTable; }
-    }
-
-    public const int EntityIdFieldNumber = 1;
-    private bool hasEntityId;
-    private string entityId_ = "";
-    public bool HasEntityId
-    {
-        get { return hasEntityId; }
-    }
-    public string EntityId
-    {
-        get { return entityId_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasEntityId) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
+      }
+      
+      public static pbd::MessageDescriptor Descriptor {
+        get { return global::ClusterShardingMessages.internal__static_CoordinatorState_ShardEntry__Descriptor; }
+      }
+      
+      protected override pb::FieldAccess.FieldAccessorTable<ShardEntry, ShardEntry.Builder> InternalFieldAccessors {
+        get { return global::ClusterShardingMessages.internal__static_CoordinatorState_ShardEntry__FieldAccessorTable; }
+      }
+      
+      public const int ShardIdFieldNumber = 1;
+      private bool hasShardId;
+      private string shardId_ = "";
+      public bool HasShardId {
+        get { return hasShardId; }
+      }
+      public string ShardId {
+        get { return shardId_; }
+      }
+      
+      public const int RegionRefFieldNumber = 2;
+      private bool hasRegionRef;
+      private string regionRef_ = "";
+      public bool HasRegionRef {
+        get { return hasRegionRef; }
+      }
+      public string RegionRef {
+        get { return regionRef_; }
+      }
+      
+      public override bool IsInitialized {
+        get {
+          if (!hasShardId) return false;
+          if (!hasRegionRef) return false;
+          return true;
+        }
+      }
+      
+      public override void WriteTo(pb::ICodedOutputStream output) {
         int size = SerializedSize;
-        string[] field_names = _entityStartedFieldNames;
-        if (hasEntityId)
-        {
-            output.WriteString(1, field_names[0], EntityId);
+        string[] field_names = _shardEntryFieldNames;
+        if (hasShardId) {
+          output.WriteString(1, field_names[1], ShardId);
         }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasEntityId)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, EntityId);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
+        if (hasRegionRef) {
+          output.WriteString(2, field_names[0], RegionRef);
         }
-    }
-
-    public static EntityStarted ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStarted ParseDelimitedFrom(global::System.IO.Stream input)
-    {
+        UnknownFields.WriteTo(output);
+      }
+      
+      private int memoizedSerializedSize = -1;
+      public override int SerializedSize {
+        get {
+          int size = memoizedSerializedSize;
+          if (size != -1) return size;
+          
+          size = 0;
+          if (hasShardId) {
+            size += pb::CodedOutputStream.ComputeStringSize(1, ShardId);
+          }
+          if (hasRegionRef) {
+            size += pb::CodedOutputStream.ComputeStringSize(2, RegionRef);
+          }
+          size += UnknownFields.SerializedSize;
+          memoizedSerializedSize = size;
+          return size;
+        }
+      }
+      
+      public static ShardEntry ParseFrom(pb::ByteString data) {
+        return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+        return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(byte[] data) {
+        return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+        return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(global::System.IO.Stream input) {
+        return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+        return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+      }
+      public static ShardEntry ParseDelimitedFrom(global::System.IO.Stream input) {
         return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static EntityStarted ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
+      }
+      public static ShardEntry ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
         return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityStarted ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private EntityStarted MakeReadOnly()
-    {
+      }
+      public static ShardEntry ParseFrom(pb::ICodedInputStream input) {
+        return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+      }
+      public static ShardEntry ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+      }
+      private ShardEntry MakeReadOnly() {
         return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(EntityStarted prototype)
-    {
+      }
+      
+      public static Builder CreateBuilder() { return new Builder(); }
+      public override Builder ToBuilder() { return CreateBuilder(this); }
+      public override Builder CreateBuilderForType() { return new Builder(); }
+      public static Builder CreateBuilder(ShardEntry prototype) {
         return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<EntityStarted, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(EntityStarted cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
+      }
+      
+      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+      public sealed partial class Builder : pb::GeneratedBuilder<ShardEntry, Builder> {
+        protected override Builder ThisBuilder {
+          get { return this; }
+        }
+        public Builder() {
+          result = DefaultInstance;
+          resultIsReadOnly = true;
+        }
+        internal Builder(ShardEntry cloneFrom) {
+          result = cloneFrom;
+          resultIsReadOnly = true;
+        }
+        
         private bool resultIsReadOnly;
-        private EntityStarted result;
-
-        private EntityStarted PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                EntityStarted original = result;
-                result = new EntityStarted();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
+        private ShardEntry result;
+        
+        private ShardEntry PrepareBuilder() {
+          if (resultIsReadOnly) {
+            ShardEntry original = result;
+            result = new ShardEntry();
+            resultIsReadOnly = false;
+            MergeFrom(original);
+          }
+          return result;
+        }
+        
+        public override bool IsInitialized {
+          get { return result.IsInitialized; }
+        }
+        
+        protected override ShardEntry MessageBeingBuilt {
+          get { return PrepareBuilder(); }
+        }
+        
+        public override Builder Clear() {
+          result = DefaultInstance;
+          resultIsReadOnly = true;
+          return this;
+        }
+        
+        public override Builder Clone() {
+          if (resultIsReadOnly) {
+            return new Builder(result);
+          } else {
+            return new Builder().MergeFrom(result);
+          }
+        }
+        
+        public override pbd::MessageDescriptor DescriptorForType {
+          get { return global::CoordinatorState.Types.ShardEntry.Descriptor; }
+        }
+        
+        public override ShardEntry DefaultInstanceForType {
+          get { return global::CoordinatorState.Types.ShardEntry.DefaultInstance; }
+        }
+        
+        public override ShardEntry BuildPartial() {
+          if (resultIsReadOnly) {
             return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override EntityStarted MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::EntityStarted.Descriptor; }
-        }
-
-        public override EntityStarted DefaultInstanceForType
-        {
-            get { return global::EntityStarted.DefaultInstance; }
-        }
-
-        public override EntityStarted BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
-
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is EntityStarted)
-            {
-                return MergeFrom((EntityStarted)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
-
-        public override Builder MergeFrom(EntityStarted other)
-        {
-            if (other == global::EntityStarted.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasEntityId)
-            {
-                EntityId = other.EntityId;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
+          }
+          resultIsReadOnly = true;
+          return result.MakeReadOnly();
+        }
+        
+        public override Builder MergeFrom(pb::IMessage other) {
+          if (other is ShardEntry) {
+            return MergeFrom((ShardEntry) other);
+          } else {
+            base.MergeFrom(other);
             return this;
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
-
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_entityStartedFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _entityStartedFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
+          }
+        }
+        
+        public override Builder MergeFrom(ShardEntry other) {
+          if (other == global::CoordinatorState.Types.ShardEntry.DefaultInstance) return this;
+          PrepareBuilder();
+          if (other.HasShardId) {
+            ShardId = other.ShardId;
+          }
+          if (other.HasRegionRef) {
+            RegionRef = other.RegionRef;
+          }
+          this.MergeUnknownFields(other.UnknownFields);
+          return this;
+        }
+        
+        public override Builder MergeFrom(pb::ICodedInputStream input) {
+          return MergeFrom(input, pb::ExtensionRegistry.Empty);
+        }
+        
+        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+          PrepareBuilder();
+          pb::UnknownFieldSet.Builder unknownFields = null;
+          uint tag;
+          string field_name;
+          while (input.ReadTag(out tag, out field_name)) {
+            if(tag == 0 && field_name != null) {
+              int field_ordinal = global::System.Array.BinarySearch(_shardEntryFieldNames, field_name, global::System.StringComparer.Ordinal);
+              if(field_ordinal >= 0)
+                tag = _shardEntryFieldTags[field_ordinal];
+              else {
+                if (unknownFields == null) {
+                  unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
                 }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasEntityId = input.ReadString(ref result.entityId_);
-                            break;
-                        }
+                ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+                continue;
+              }
+            }
+            switch (tag) {
+              case 0: {
+                throw pb::InvalidProtocolBufferException.InvalidTag();
+              }
+              default: {
+                if (pb::WireFormat.IsEndGroupTag(tag)) {
+                  if (unknownFields != null) {
+                    this.UnknownFields = unknownFields.Build();
+                  }
+                  return this;
                 }
-            }
-
-            if (unknownFields != null)
-            {
-                this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
-
-
-        public bool HasEntityId
-        {
-            get { return result.hasEntityId; }
-        }
-        public string EntityId
-        {
-            get { return result.EntityId; }
-            set { SetEntityId(value); }
-        }
-        public Builder SetEntityId(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasEntityId = true;
-            result.entityId_ = value;
-            return this;
-        }
-        public Builder ClearEntityId()
-        {
-            PrepareBuilder();
-            result.hasEntityId = false;
-            result.entityId_ = "";
-            return this;
-        }
-    }
-    static EntityStarted()
-    {
+                if (unknownFields == null) {
+                  unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+                }
+                ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+                break;
+              }
+              case 10: {
+                result.hasShardId = input.ReadString(ref result.shardId_);
+                break;
+              }
+              case 18: {
+                result.hasRegionRef = input.ReadString(ref result.regionRef_);
+                break;
+              }
+            }
+          }
+          
+          if (unknownFields != null) {
+            this.UnknownFields = unknownFields.Build();
+          }
+          return this;
+        }
+        
+        
+        public bool HasShardId {
+          get { return result.hasShardId; }
+        }
+        public string ShardId {
+          get { return result.ShardId; }
+          set { SetShardId(value); }
+        }
+        public Builder SetShardId(string value) {
+          pb::ThrowHelper.ThrowIfNull(value, "value");
+          PrepareBuilder();
+          result.hasShardId = true;
+          result.shardId_ = value;
+          return this;
+        }
+        public Builder ClearShardId() {
+          PrepareBuilder();
+          result.hasShardId = false;
+          result.shardId_ = "";
+          return this;
+        }
+        
+        public bool HasRegionRef {
+          get { return result.hasRegionRef; }
+        }
+        public string RegionRef {
+          get { return result.RegionRef; }
+          set { SetRegionRef(value); }
+        }
+        public Builder SetRegionRef(string value) {
+          pb::ThrowHelper.ThrowIfNull(value, "value");
+          PrepareBuilder();
+          result.hasRegionRef = true;
+          result.regionRef_ = value;
+          return this;
+        }
+        public Builder ClearRegionRef() {
+          PrepareBuilder();
+          result.hasRegionRef = false;
+          result.regionRef_ = "";
+          return this;
+        }
+      }
+      static ShardEntry() {
         object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
+      }
+    }
+    
+  }
+  #endregion
+  
+  public const int ShardsFieldNumber = 1;
+  private pbc::PopsicleList<global::CoordinatorState.Types.ShardEntry> shards_ = new pbc::PopsicleList<global::CoordinatorState.Types.ShardEntry>();
+  public scg::IList<global::CoordinatorState.Types.ShardEntry> ShardsList {
+    get { return shards_; }
+  }
+  public int ShardsCount {
+    get { return shards_.Count; }
+  }
+  public global::CoordinatorState.Types.ShardEntry GetShards(int index) {
+    return shards_[index];
+  }
+  
+  public const int RegionsFieldNumber = 2;
+  private pbc::PopsicleList<string> regions_ = new pbc::PopsicleList<string>();
+  public scg::IList<string> RegionsList {
+    get { return pbc::Lists.AsReadOnly(regions_); }
+  }
+  public int RegionsCount {
+    get { return regions_.Count; }
+  }
+  public string GetRegions(int index) {
+    return regions_[index];
+  }
+  
+  public const int RegionProxiesFieldNumber = 3;
+  private pbc::PopsicleList<string> regionProxies_ = new pbc::PopsicleList<string>();
+  public scg::IList<string> RegionProxiesList {
+    get { return pbc::Lists.AsReadOnly(regionProxies_); }
+  }
+  public int RegionProxiesCount {
+    get { return regionProxies_.Count; }
+  }
+  public string GetRegionProxies(int index) {
+    return regionProxies_[index];
+  }
+  
+  public const int UnallocatedShardsFieldNumber = 4;
+  private pbc::PopsicleList<string> unallocatedShards_ = new pbc::PopsicleList<string>();
+  public scg::IList<string> UnallocatedShardsList {
+    get { return pbc::Lists.AsReadOnly(unallocatedShards_); }
+  }
+  public int UnallocatedShardsCount {
+    get { return unallocatedShards_.Count; }
+  }
+  public string GetUnallocatedShards(int index) {
+    return unallocatedShards_[index];
+  }
+  
+  public override bool IsInitialized {
+    get {
+      foreach (global::CoordinatorState.Types.ShardEntry element in ShardsList) {
+        if (!element.IsInitialized) return false;
+      }
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _coordinatorStateFieldNames;
+    if (shards_.Count > 0) {
+      output.WriteMessageArray(1, field_names[2], shards_);
+    }
+    if (regions_.Count > 0) {
+      output.WriteStringArray(2, field_names[1], regions_);
+    }
+    if (regionProxies_.Count > 0) {
+      output.WriteStringArray(3, field_names[0], regionProxies_);
+    }
+    if (unallocatedShards_.Count > 0) {
+      output.WriteStringArray(4, field_names[3], unallocatedShards_);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      foreach (global::CoordinatorState.Types.ShardEntry element in ShardsList) {
+        size += pb::CodedOutputStream.ComputeMessageSize(1, element);
+      }
+      {
+        int dataSize = 0;
+        foreach (string element in RegionsList) {
+          dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
+        }
+        size += dataSize;
+        size += 1 * regions_.Count;
+      }
+      {
+        int dataSize = 0;
+        foreach (string element in RegionProxiesList) {
+          dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
+        }
+        size += dataSize;
+        size += 1 * regionProxies_.Count;
+      }
+      {
+        int dataSize = 0;
+        foreach (string element in UnallocatedShardsList) {
+          dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
+        }
+        size += dataSize;
+        size += 1 * unallocatedShards_.Count;
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static CoordinatorState ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static CoordinatorState ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static CoordinatorState ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static CoordinatorState ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private CoordinatorState MakeReadOnly() {
+    shards_.MakeReadOnly();
+    regions_.MakeReadOnly();
+    regionProxies_.MakeReadOnly();
+    unallocatedShards_.MakeReadOnly();
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(CoordinatorState prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<CoordinatorState, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(CoordinatorState cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private CoordinatorState result;
+    
+    private CoordinatorState PrepareBuilder() {
+      if (resultIsReadOnly) {
+        CoordinatorState original = result;
+        result = new CoordinatorState();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override CoordinatorState MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::CoordinatorState.Descriptor; }
+    }
+    
+    public override CoordinatorState DefaultInstanceForType {
+      get { return global::CoordinatorState.DefaultInstance; }
+    }
+    
+    public override CoordinatorState BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is CoordinatorState) {
+        return MergeFrom((CoordinatorState) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(CoordinatorState other) {
+      if (other == global::CoordinatorState.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.shards_.Count != 0) {
+        result.shards_.Add(other.shards_);
+      }
+      if (other.regions_.Count != 0) {
+        result.regions_.Add(other.regions_);
+      }
+      if (other.regionProxies_.Count != 0) {
+        result.regionProxies_.Add(other.regionProxies_);
+      }
+      if (other.unallocatedShards_.Count != 0) {
+        result.unallocatedShards_.Add(other.unallocatedShards_);
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_coordinatorStateFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _coordinatorStateFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            input.ReadMessageArray(tag, field_name, result.shards_, global::CoordinatorState.Types.ShardEntry.DefaultInstance, extensionRegistry);
+            break;
+          }
+          case 18: {
+            input.ReadStringArray(tag, field_name, result.regions_);
+            break;
+          }
+          case 26: {
+            input.ReadStringArray(tag, field_name, result.regionProxies_);
+            break;
+          }
+          case 34: {
+            input.ReadStringArray(tag, field_name, result.unallocatedShards_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public pbc::IPopsicleList<global::CoordinatorState.Types.ShardEntry> ShardsList {
+      get { return PrepareBuilder().shards_; }
+    }
+    public int ShardsCount {
+      get { return result.ShardsCount; }
+    }
+    public global::CoordinatorState.Types.ShardEntry GetShards(int index) {
+      return result.GetShards(index);
+    }
+    public Builder SetShards(int index, global::CoordinatorState.Types.ShardEntry value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.shards_[index] = value;
+      return this;
+    }
+    public Builder SetShards(int index, global::CoordinatorState.Types.ShardEntry.Builder builderForValue) {
+      pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
+      PrepareBuilder();
+      result.shards_[index] = builderForValue.Build();
+      return this;
+    }
+    public Builder AddShards(global::CoordinatorState.Types.ShardEntry value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.shards_.Add(value);
+      return this;
+    }
+    public Builder AddShards(global::CoordinatorState.Types.ShardEntry.Builder builderForValue) {
+      pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
+      PrepareBuilder();
+      result.shards_.Add(builderForValue.Build());
+      return this;
+    }
+    public Builder AddRangeShards(scg::IEnumerable<global::CoordinatorState.Types.ShardEntry> values) {
+      PrepareBuilder();
+      result.shards_.Add(values);
+      return this;
+    }
+    public Builder ClearShards() {
+      PrepareBuilder();
+      result.shards_.Clear();
+      return this;
+    }
+    
+    public pbc::IPopsicleList<string> RegionsList {
+      get { return PrepareBuilder().regions_; }
+    }
+    public int RegionsCount {
+      get { return result.RegionsCount; }
+    }
+    public string GetRegions(int index) {
+      return result.GetRegions(index);
+    }
+    public Builder SetRegions(int index, string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.regions_[index] = value;
+      return this;
+    }
+    public Builder AddRegions(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.regions_.Add(value);
+      return this;
+    }
+    public Builder AddRangeRegions(scg::IEnumerable<string> values) {
+      PrepareBuilder();
+      result.regions_.Add(values);
+      return this;
+    }
+    public Builder ClearRegions() {
+      PrepareBuilder();
+      result.regions_.Clear();
+      return this;
+    }
+    
+    public pbc::IPopsicleList<string> RegionProxiesList {
+      get { return PrepareBuilder().regionProxies_; }
+    }
+    public int RegionProxiesCount {
+      get { return result.RegionProxiesCount; }
+    }
+    public string GetRegionProxies(int index) {
+      return result.GetRegionProxies(index);
+    }
+    public Builder SetRegionProxies(int index, string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.regionProxies_[index] = value;
+      return this;
+    }
+    public Builder AddRegionProxies(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.regionProxies_.Add(value);
+      return this;
+    }
+    public Builder AddRangeRegionProxies(scg::IEnumerable<string> values) {
+      PrepareBuilder();
+      result.regionProxies_.Add(values);
+      return this;
+    }
+    public Builder ClearRegionProxies() {
+      PrepareBuilder();
+      result.regionProxies_.Clear();
+      return this;
+    }
+    
+    public pbc::IPopsicleList<string> UnallocatedShardsList {
+      get { return PrepareBuilder().unallocatedShards_; }
+    }
+    public int UnallocatedShardsCount {
+      get { return result.UnallocatedShardsCount; }
+    }
+    public string GetUnallocatedShards(int index) {
+      return result.GetUnallocatedShards(index);
+    }
+    public Builder SetUnallocatedShards(int index, string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.unallocatedShards_[index] = value;
+      return this;
+    }
+    public Builder AddUnallocatedShards(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.unallocatedShards_.Add(value);
+      return this;
+    }
+    public Builder AddRangeUnallocatedShards(scg::IEnumerable<string> values) {
+      PrepareBuilder();
+      result.unallocatedShards_.Add(values);
+      return this;
+    }
+    public Builder ClearUnallocatedShards() {
+      PrepareBuilder();
+      result.unallocatedShards_.Clear();
+      return this;
+    }
+  }
+  static CoordinatorState() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
 }
 
 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-public sealed partial class EntityStopped : pb::GeneratedMessage<EntityStopped, EntityStopped.Builder>
-{
-    private EntityStopped() { }
-    private static readonly EntityStopped defaultInstance = new EntityStopped().MakeReadOnly();
-    private static readonly string[] _entityStoppedFieldNames = new string[] { "entityId" };
-    private static readonly uint[] _entityStoppedFieldTags = new uint[] { 10 };
-    public static EntityStopped DefaultInstance
-    {
-        get { return defaultInstance; }
-    }
-
-    public override EntityStopped DefaultInstanceForType
-    {
-        get { return DefaultInstance; }
-    }
-
-    protected override EntityStopped ThisMessage
-    {
-        get { return this; }
-    }
-
-    public static pbd::MessageDescriptor Descriptor
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityStopped__Descriptor; }
-    }
-
-    protected override pb::FieldAccess.FieldAccessorTable<EntityStopped, EntityStopped.Builder> InternalFieldAccessors
-    {
-        get { return global::ClusterShardingMessages.internal__static_EntityStopped__FieldAccessorTable; }
-    }
-
-    public const int EntityIdFieldNumber = 1;
-    private bool hasEntityId;
-    private string entityId_ = "";
-    public bool HasEntityId
-    {
-        get { return hasEntityId; }
-    }
-    public string EntityId
-    {
-        get { return entityId_; }
-    }
-
-    public override bool IsInitialized
-    {
-        get
-        {
-            if (!hasEntityId) return false;
-            return true;
-        }
-    }
-
-    public override void WriteTo(pb::ICodedOutputStream output)
-    {
-        int size = SerializedSize;
-        string[] field_names = _entityStoppedFieldNames;
-        if (hasEntityId)
-        {
-            output.WriteString(1, field_names[0], EntityId);
-        }
-        UnknownFields.WriteTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize
-    {
-        get
-        {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-
-            size = 0;
-            if (hasEntityId)
-            {
-                size += pb::CodedOutputStream.ComputeStringSize(1, EntityId);
-            }
-            size += UnknownFields.SerializedSize;
-            memoizedSerializedSize = size;
-            return size;
-        }
-    }
-
-    public static EntityStopped ParseFrom(pb::ByteString data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(byte[] data)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(global::System.IO.Stream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static EntityStopped ParseDelimitedFrom(global::System.IO.Stream input)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static EntityStopped ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(pb::ICodedInputStream input)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static EntityStopped ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-    {
-        return ((Builder)CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    private EntityStopped MakeReadOnly()
-    {
+public sealed partial class ActorRefMessage : pb::GeneratedMessage<ActorRefMessage, ActorRefMessage.Builder> {
+  private ActorRefMessage() { }
+  private static readonly ActorRefMessage defaultInstance = new ActorRefMessage().MakeReadOnly();
+  private static readonly string[] _actorRefMessageFieldNames = new string[] { "ref" };
+  private static readonly uint[] _actorRefMessageFieldTags = new uint[] { 10 };
+  public static ActorRefMessage DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override ActorRefMessage DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override ActorRefMessage ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_ActorRefMessage__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<ActorRefMessage, ActorRefMessage.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_ActorRefMessage__FieldAccessorTable; }
+  }
+  
+  public const int RefFieldNumber = 1;
+  private bool hasRef;
+  private string ref_ = "";
+  public bool HasRef {
+    get { return hasRef; }
+  }
+  public string Ref {
+    get { return ref_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasRef) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _actorRefMessageFieldNames;
+    if (hasRef) {
+      output.WriteString(1, field_names[0], Ref);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasRef) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, Ref);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static ActorRefMessage ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static ActorRefMessage ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static ActorRefMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ActorRefMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private ActorRefMessage MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(ActorRefMessage prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<ActorRefMessage, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(ActorRefMessage cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private ActorRefMessage result;
+    
+    private ActorRefMessage PrepareBuilder() {
+      if (resultIsReadOnly) {
+        ActorRefMessage original = result;
+        result = new ActorRefMessage();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override ActorRefMessage MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::ActorRefMessage.Descriptor; }
+    }
+    
+    public override ActorRefMessage DefaultInstanceForType {
+      get { return global::ActorRefMessage.DefaultInstance; }
+    }
+    
+    public override ActorRefMessage BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is ActorRefMessage) {
+        return MergeFrom((ActorRefMessage) other);
+      } else {
+        base.MergeFrom(other);
         return this;
-    }
-
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(EntityStopped prototype)
-    {
-        return new Builder(prototype);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public sealed partial class Builder : pb::GeneratedBuilder<EntityStopped, Builder>
-    {
-        protected override Builder ThisBuilder
-        {
-            get { return this; }
-        }
-        public Builder()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-        }
-        internal Builder(EntityStopped cloneFrom)
-        {
-            result = cloneFrom;
-            resultIsReadOnly = true;
-        }
-
-        private bool resultIsReadOnly;
-        private EntityStopped result;
-
-        private EntityStopped PrepareBuilder()
-        {
-            if (resultIsReadOnly)
-            {
-                EntityStopped original = result;
-                result = new EntityStopped();
-                resultIsReadOnly = false;
-                MergeFrom(original);
-            }
-            return result;
-        }
-
-        public override bool IsInitialized
-        {
-            get { return result.IsInitialized; }
-        }
-
-        protected override EntityStopped MessageBeingBuilt
-        {
-            get { return PrepareBuilder(); }
-        }
-
-        public override Builder Clear()
-        {
-            result = DefaultInstance;
-            resultIsReadOnly = true;
-            return this;
-        }
-
-        public override Builder Clone()
-        {
-            if (resultIsReadOnly)
-            {
-                return new Builder(result);
-            }
-            else
-            {
-                return new Builder().MergeFrom(result);
-            }
-        }
-
-        public override pbd::MessageDescriptor DescriptorForType
-        {
-            get { return global::EntityStopped.Descriptor; }
-        }
-
-        public override EntityStopped DefaultInstanceForType
-        {
-            get { return global::EntityStopped.DefaultInstance; }
-        }
-
-        public override EntityStopped BuildPartial()
-        {
-            if (resultIsReadOnly)
-            {
-                return result;
-            }
-            resultIsReadOnly = true;
-            return result.MakeReadOnly();
-        }
+      }
+    }
+    
+    public override Builder MergeFrom(ActorRefMessage other) {
+      if (other == global::ActorRefMessage.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasRef) {
+        Ref = other.Ref;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_actorRefMessageFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _actorRefMessageFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasRef = input.ReadString(ref result.ref_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasRef {
+      get { return result.hasRef; }
+    }
+    public string Ref {
+      get { return result.Ref; }
+      set { SetRef(value); }
+    }
+    public Builder SetRef(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasRef = true;
+      result.ref_ = value;
+      return this;
+    }
+    public Builder ClearRef() {
+      PrepareBuilder();
+      result.hasRef = false;
+      result.ref_ = "";
+      return this;
+    }
+  }
+  static ActorRefMessage() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-        public override Builder MergeFrom(pb::IMessage other)
-        {
-            if (other is EntityStopped)
-            {
-                return MergeFrom((EntityStopped)other);
-            }
-            else
-            {
-                base.MergeFrom(other);
-                return this;
-            }
-        }
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class ShardIdMessage : pb::GeneratedMessage<ShardIdMessage, ShardIdMessage.Builder> {
+  private ShardIdMessage() { }
+  private static readonly ShardIdMessage defaultInstance = new ShardIdMessage().MakeReadOnly();
+  private static readonly string[] _shardIdMessageFieldNames = new string[] { "shard" };
+  private static readonly uint[] _shardIdMessageFieldTags = new uint[] { 10 };
+  public static ShardIdMessage DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override ShardIdMessage DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override ShardIdMessage ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_ShardIdMessage__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<ShardIdMessage, ShardIdMessage.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_ShardIdMessage__FieldAccessorTable; }
+  }
+  
+  public const int ShardFieldNumber = 1;
+  private bool hasShard;
+  private string shard_ = "";
+  public bool HasShard {
+    get { return hasShard; }
+  }
+  public string Shard {
+    get { return shard_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasShard) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _shardIdMessageFieldNames;
+    if (hasShard) {
+      output.WriteString(1, field_names[0], Shard);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasShard) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static ShardIdMessage ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static ShardIdMessage ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static ShardIdMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardIdMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private ShardIdMessage MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(ShardIdMessage prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<ShardIdMessage, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(ShardIdMessage cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private ShardIdMessage result;
+    
+    private ShardIdMessage PrepareBuilder() {
+      if (resultIsReadOnly) {
+        ShardIdMessage original = result;
+        result = new ShardIdMessage();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override ShardIdMessage MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::ShardIdMessage.Descriptor; }
+    }
+    
+    public override ShardIdMessage DefaultInstanceForType {
+      get { return global::ShardIdMessage.DefaultInstance; }
+    }
+    
+    public override ShardIdMessage BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is ShardIdMessage) {
+        return MergeFrom((ShardIdMessage) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(ShardIdMessage other) {
+      if (other == global::ShardIdMessage.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasShard) {
+        Shard = other.Shard;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_shardIdMessageFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _shardIdMessageFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasShard = input.ReadString(ref result.shard_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasShard {
+      get { return result.hasShard; }
+    }
+    public string Shard {
+      get { return result.Shard; }
+      set { SetShard(value); }
+    }
+    public Builder SetShard(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasShard = true;
+      result.shard_ = value;
+      return this;
+    }
+    public Builder ClearShard() {
+      PrepareBuilder();
+      result.hasShard = false;
+      result.shard_ = "";
+      return this;
+    }
+  }
+  static ShardIdMessage() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-        public override Builder MergeFrom(EntityStopped other)
-        {
-            if (other == global::EntityStopped.DefaultInstance) return this;
-            PrepareBuilder();
-            if (other.HasEntityId)
-            {
-                EntityId = other.EntityId;
-            }
-            this.MergeUnknownFields(other.UnknownFields);
-            return this;
-        }
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class ShardHomeAllocated : pb::GeneratedMessage<ShardHomeAllocated, ShardHomeAllocated.Builder> {
+  private ShardHomeAllocated() { }
+  private static readonly ShardHomeAllocated defaultInstance = new ShardHomeAllocated().MakeReadOnly();
+  private static readonly string[] _shardHomeAllocatedFieldNames = new string[] { "region", "shard" };
+  private static readonly uint[] _shardHomeAllocatedFieldTags = new uint[] { 18, 10 };
+  public static ShardHomeAllocated DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override ShardHomeAllocated DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override ShardHomeAllocated ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_ShardHomeAllocated__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<ShardHomeAllocated, ShardHomeAllocated.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_ShardHomeAllocated__FieldAccessorTable; }
+  }
+  
+  public const int ShardFieldNumber = 1;
+  private bool hasShard;
+  private string shard_ = "";
+  public bool HasShard {
+    get { return hasShard; }
+  }
+  public string Shard {
+    get { return shard_; }
+  }
+  
+  public const int RegionFieldNumber = 2;
+  private bool hasRegion;
+  private string region_ = "";
+  public bool HasRegion {
+    get { return hasRegion; }
+  }
+  public string Region {
+    get { return region_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasShard) return false;
+      if (!hasRegion) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _shardHomeAllocatedFieldNames;
+    if (hasShard) {
+      output.WriteString(1, field_names[1], Shard);
+    }
+    if (hasRegion) {
+      output.WriteString(2, field_names[0], Region);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasShard) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
+      }
+      if (hasRegion) {
+        size += pb::CodedOutputStream.ComputeStringSize(2, Region);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static ShardHomeAllocated ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardHomeAllocated ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private ShardHomeAllocated MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(ShardHomeAllocated prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<ShardHomeAllocated, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(ShardHomeAllocated cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private ShardHomeAllocated result;
+    
+    private ShardHomeAllocated PrepareBuilder() {
+      if (resultIsReadOnly) {
+        ShardHomeAllocated original = result;
+        result = new ShardHomeAllocated();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override ShardHomeAllocated MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::ShardHomeAllocated.Descriptor; }
+    }
+    
+    public override ShardHomeAllocated DefaultInstanceForType {
+      get { return global::ShardHomeAllocated.DefaultInstance; }
+    }
+    
+    public override ShardHomeAllocated BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is ShardHomeAllocated) {
+        return MergeFrom((ShardHomeAllocated) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(ShardHomeAllocated other) {
+      if (other == global::ShardHomeAllocated.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasShard) {
+        Shard = other.Shard;
+      }
+      if (other.HasRegion) {
+        Region = other.Region;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_shardHomeAllocatedFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _shardHomeAllocatedFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasShard = input.ReadString(ref result.shard_);
+            break;
+          }
+          case 18: {
+            result.hasRegion = input.ReadString(ref result.region_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasShard {
+      get { return result.hasShard; }
+    }
+    public string Shard {
+      get { return result.Shard; }
+      set { SetShard(value); }
+    }
+    public Builder SetShard(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasShard = true;
+      result.shard_ = value;
+      return this;
+    }
+    public Builder ClearShard() {
+      PrepareBuilder();
+      result.hasShard = false;
+      result.shard_ = "";
+      return this;
+    }
+    
+    public bool HasRegion {
+      get { return result.hasRegion; }
+    }
+    public string Region {
+      get { return result.Region; }
+      set { SetRegion(value); }
+    }
+    public Builder SetRegion(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasRegion = true;
+      result.region_ = value;
+      return this;
+    }
+    public Builder ClearRegion() {
+      PrepareBuilder();
+      result.hasRegion = false;
+      result.region_ = "";
+      return this;
+    }
+  }
+  static ShardHomeAllocated() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-        public override Builder MergeFrom(pb::ICodedInputStream input)
-        {
-            return MergeFrom(input, pb::ExtensionRegistry.Empty);
-        }
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class ShardHome : pb::GeneratedMessage<ShardHome, ShardHome.Builder> {
+  private ShardHome() { }
+  private static readonly ShardHome defaultInstance = new ShardHome().MakeReadOnly();
+  private static readonly string[] _shardHomeFieldNames = new string[] { "region", "shard" };
+  private static readonly uint[] _shardHomeFieldTags = new uint[] { 18, 10 };
+  public static ShardHome DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override ShardHome DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override ShardHome ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_ShardHome__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<ShardHome, ShardHome.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_ShardHome__FieldAccessorTable; }
+  }
+  
+  public const int ShardFieldNumber = 1;
+  private bool hasShard;
+  private string shard_ = "";
+  public bool HasShard {
+    get { return hasShard; }
+  }
+  public string Shard {
+    get { return shard_; }
+  }
+  
+  public const int RegionFieldNumber = 2;
+  private bool hasRegion;
+  private string region_ = "";
+  public bool HasRegion {
+    get { return hasRegion; }
+  }
+  public string Region {
+    get { return region_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasShard) return false;
+      if (!hasRegion) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _shardHomeFieldNames;
+    if (hasShard) {
+      output.WriteString(1, field_names[1], Shard);
+    }
+    if (hasRegion) {
+      output.WriteString(2, field_names[0], Region);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasShard) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
+      }
+      if (hasRegion) {
+        size += pb::CodedOutputStream.ComputeStringSize(2, Region);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static ShardHome ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static ShardHome ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static ShardHome ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static ShardHome ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardHome ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private ShardHome MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(ShardHome prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<ShardHome, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(ShardHome cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private ShardHome result;
+    
+    private ShardHome PrepareBuilder() {
+      if (resultIsReadOnly) {
+        ShardHome original = result;
+        result = new ShardHome();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override ShardHome MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::ShardHome.Descriptor; }
+    }
+    
+    public override ShardHome DefaultInstanceForType {
+      get { return global::ShardHome.DefaultInstance; }
+    }
+    
+    public override ShardHome BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is ShardHome) {
+        return MergeFrom((ShardHome) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(ShardHome other) {
+      if (other == global::ShardHome.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasShard) {
+        Shard = other.Shard;
+      }
+      if (other.HasRegion) {
+        Region = other.Region;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_shardHomeFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _shardHomeFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasShard = input.ReadString(ref result.shard_);
+            break;
+          }
+          case 18: {
+            result.hasRegion = input.ReadString(ref result.region_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasShard {
+      get { return result.hasShard; }
+    }
+    public string Shard {
+      get { return result.Shard; }
+      set { SetShard(value); }
+    }
+    public Builder SetShard(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasShard = true;
+      result.shard_ = value;
+      return this;
+    }
+    public Builder ClearShard() {
+      PrepareBuilder();
+      result.hasShard = false;
+      result.shard_ = "";
+      return this;
+    }
+    
+    public bool HasRegion {
+      get { return result.hasRegion; }
+    }
+    public string Region {
+      get { return result.Region; }
+      set { SetRegion(value); }
+    }
+    public Builder SetRegion(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasRegion = true;
+      result.region_ = value;
+      return this;
+    }
+    public Builder ClearRegion() {
+      PrepareBuilder();
+      result.hasRegion = false;
+      result.region_ = "";
+      return this;
+    }
+  }
+  static ShardHome() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-        public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry)
-        {
-            PrepareBuilder();
-            pb::UnknownFieldSet.Builder unknownFields = null;
-            uint tag;
-            string field_name;
-            while (input.ReadTag(out tag, out field_name))
-            {
-                if (tag == 0 && field_name != null)
-                {
-                    int field_ordinal = global::System.Array.BinarySearch(_entityStoppedFieldNames, field_name, global::System.StringComparer.Ordinal);
-                    if (field_ordinal >= 0)
-                        tag = _entityStoppedFieldTags[field_ordinal];
-                    else
-                    {
-                        if (unknownFields == null)
-                        {
-                            unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                        }
-                        ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                        continue;
-                    }
-                }
-                switch (tag)
-                {
-                    case 0:
-                        {
-                            throw pb::InvalidProtocolBufferException.InvalidTag();
-                        }
-                    default:
-                        {
-                            if (pb::WireFormat.IsEndGroupTag(tag))
-                            {
-                                if (unknownFields != null)
-                                {
-                                    this.UnknownFields = unknownFields.Build();
-                                }
-                                return this;
-                            }
-                            if (unknownFields == null)
-                            {
-                                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                            }
-                            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
-                            break;
-                        }
-                    case 10:
-                        {
-                            result.hasEntityId = input.ReadString(ref result.entityId_);
-                            break;
-                        }
-                }
-            }
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class EntityState : pb::GeneratedMessage<EntityState, EntityState.Builder> {
+  private EntityState() { }
+  private static readonly EntityState defaultInstance = new EntityState().MakeReadOnly();
+  private static readonly string[] _entityStateFieldNames = new string[] { "entities" };
+  private static readonly uint[] _entityStateFieldTags = new uint[] { 10 };
+  public static EntityState DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override EntityState DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override EntityState ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_EntityState__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<EntityState, EntityState.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_EntityState__FieldAccessorTable; }
+  }
+  
+  public const int EntitiesFieldNumber = 1;
+  private pbc::PopsicleList<string> entities_ = new pbc::PopsicleList<string>();
+  public scg::IList<string> EntitiesList {
+    get { return pbc::Lists.AsReadOnly(entities_); }
+  }
+  public int EntitiesCount {
+    get { return entities_.Count; }
+  }
+  public string GetEntities(int index) {
+    return entities_[index];
+  }
+  
+  public override bool IsInitialized {
+    get {
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _entityStateFieldNames;
+    if (entities_.Count > 0) {
+      output.WriteStringArray(1, field_names[0], entities_);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      {
+        int dataSize = 0;
+        foreach (string element in EntitiesList) {
+          dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element);
+        }
+        size += dataSize;
+        size += 1 * entities_.Count;
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static EntityState ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityState ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityState ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityState ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityState ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityState ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static EntityState ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static EntityState ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static EntityState ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityState ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private EntityState MakeReadOnly() {
+    entities_.MakeReadOnly();
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(EntityState prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<EntityState, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(EntityState cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private EntityState result;
+    
+    private EntityState PrepareBuilder() {
+      if (resultIsReadOnly) {
+        EntityState original = result;
+        result = new EntityState();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override EntityState MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::EntityState.Descriptor; }
+    }
+    
+    public override EntityState DefaultInstanceForType {
+      get { return global::EntityState.DefaultInstance; }
+    }
+    
+    public override EntityState BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is EntityState) {
+        return MergeFrom((EntityState) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(EntityState other) {
+      if (other == global::EntityState.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.entities_.Count != 0) {
+        result.entities_.Add(other.entities_);
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_entityStateFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _entityStateFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            input.ReadStringArray(tag, field_name, result.entities_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public pbc::IPopsicleList<string> EntitiesList {
+      get { return PrepareBuilder().entities_; }
+    }
+    public int EntitiesCount {
+      get { return result.EntitiesCount; }
+    }
+    public string GetEntities(int index) {
+      return result.GetEntities(index);
+    }
+    public Builder SetEntities(int index, string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.entities_[index] = value;
+      return this;
+    }
+    public Builder AddEntities(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.entities_.Add(value);
+      return this;
+    }
+    public Builder AddRangeEntities(scg::IEnumerable<string> values) {
+      PrepareBuilder();
+      result.entities_.Add(values);
+      return this;
+    }
+    public Builder ClearEntities() {
+      PrepareBuilder();
+      result.entities_.Clear();
+      return this;
+    }
+  }
+  static EntityState() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-            if (unknownFields != null)
-            {
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class EntityStarted : pb::GeneratedMessage<EntityStarted, EntityStarted.Builder> {
+  private EntityStarted() { }
+  private static readonly EntityStarted defaultInstance = new EntityStarted().MakeReadOnly();
+  private static readonly string[] _entityStartedFieldNames = new string[] { "entityId" };
+  private static readonly uint[] _entityStartedFieldTags = new uint[] { 10 };
+  public static EntityStarted DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override EntityStarted DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override EntityStarted ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_EntityStarted__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<EntityStarted, EntityStarted.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_EntityStarted__FieldAccessorTable; }
+  }
+  
+  public const int EntityIdFieldNumber = 1;
+  private bool hasEntityId;
+  private string entityId_ = "";
+  public bool HasEntityId {
+    get { return hasEntityId; }
+  }
+  public string EntityId {
+    get { return entityId_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasEntityId) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _entityStartedFieldNames;
+    if (hasEntityId) {
+      output.WriteString(1, field_names[0], EntityId);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasEntityId) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, EntityId);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static EntityStarted ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStarted ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static EntityStarted ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityStarted ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private EntityStarted MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(EntityStarted prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<EntityStarted, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(EntityStarted cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private EntityStarted result;
+    
+    private EntityStarted PrepareBuilder() {
+      if (resultIsReadOnly) {
+        EntityStarted original = result;
+        result = new EntityStarted();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override EntityStarted MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::EntityStarted.Descriptor; }
+    }
+    
+    public override EntityStarted DefaultInstanceForType {
+      get { return global::EntityStarted.DefaultInstance; }
+    }
+    
+    public override EntityStarted BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is EntityStarted) {
+        return MergeFrom((EntityStarted) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(EntityStarted other) {
+      if (other == global::EntityStarted.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasEntityId) {
+        EntityId = other.EntityId;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_entityStartedFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _entityStartedFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
                 this.UnknownFields = unknownFields.Build();
-            }
-            return this;
-        }
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasEntityId = input.ReadString(ref result.entityId_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasEntityId {
+      get { return result.hasEntityId; }
+    }
+    public string EntityId {
+      get { return result.EntityId; }
+      set { SetEntityId(value); }
+    }
+    public Builder SetEntityId(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasEntityId = true;
+      result.entityId_ = value;
+      return this;
+    }
+    public Builder ClearEntityId() {
+      PrepareBuilder();
+      result.hasEntityId = false;
+      result.entityId_ = "";
+      return this;
+    }
+  }
+  static EntityStarted() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class EntityStopped : pb::GeneratedMessage<EntityStopped, EntityStopped.Builder> {
+  private EntityStopped() { }
+  private static readonly EntityStopped defaultInstance = new EntityStopped().MakeReadOnly();
+  private static readonly string[] _entityStoppedFieldNames = new string[] { "entityId" };
+  private static readonly uint[] _entityStoppedFieldTags = new uint[] { 10 };
+  public static EntityStopped DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override EntityStopped DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override EntityStopped ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_EntityStopped__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<EntityStopped, EntityStopped.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_EntityStopped__FieldAccessorTable; }
+  }
+  
+  public const int EntityIdFieldNumber = 1;
+  private bool hasEntityId;
+  private string entityId_ = "";
+  public bool HasEntityId {
+    get { return hasEntityId; }
+  }
+  public string EntityId {
+    get { return entityId_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasEntityId) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _entityStoppedFieldNames;
+    if (hasEntityId) {
+      output.WriteString(1, field_names[0], EntityId);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasEntityId) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, EntityId);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static EntityStopped ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static EntityStopped ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static EntityStopped ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static EntityStopped ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private EntityStopped MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(EntityStopped prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<EntityStopped, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(EntityStopped cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private EntityStopped result;
+    
+    private EntityStopped PrepareBuilder() {
+      if (resultIsReadOnly) {
+        EntityStopped original = result;
+        result = new EntityStopped();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override EntityStopped MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::EntityStopped.Descriptor; }
+    }
+    
+    public override EntityStopped DefaultInstanceForType {
+      get { return global::EntityStopped.DefaultInstance; }
+    }
+    
+    public override EntityStopped BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is EntityStopped) {
+        return MergeFrom((EntityStopped) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(EntityStopped other) {
+      if (other == global::EntityStopped.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasEntityId) {
+        EntityId = other.EntityId;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_entityStoppedFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _entityStoppedFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasEntityId = input.ReadString(ref result.entityId_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasEntityId {
+      get { return result.hasEntityId; }
+    }
+    public string EntityId {
+      get { return result.EntityId; }
+      set { SetEntityId(value); }
+    }
+    public Builder SetEntityId(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasEntityId = true;
+      result.entityId_ = value;
+      return this;
+    }
+    public Builder ClearEntityId() {
+      PrepareBuilder();
+      result.hasEntityId = false;
+      result.entityId_ = "";
+      return this;
+    }
+  }
+  static EntityStopped() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
+}
 
-        public bool HasEntityId
-        {
-            get { return result.hasEntityId; }
-        }
-        public string EntityId
-        {
-            get { return result.EntityId; }
-            set { SetEntityId(value); }
-        }
-        public Builder SetEntityId(string value)
-        {
-            pb::ThrowHelper.ThrowIfNull(value, "value");
-            PrepareBuilder();
-            result.hasEntityId = true;
-            result.entityId_ = value;
-            return this;
-        }
-        public Builder ClearEntityId()
-        {
-            PrepareBuilder();
-            result.hasEntityId = false;
-            result.entityId_ = "";
-            return this;
-        }
-    }
-    static EntityStopped()
-    {
-        object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
-    }
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+public sealed partial class ShardStats : pb::GeneratedMessage<ShardStats, ShardStats.Builder> {
+  private ShardStats() { }
+  private static readonly ShardStats defaultInstance = new ShardStats().MakeReadOnly();
+  private static readonly string[] _shardStatsFieldNames = new string[] { "entityCount", "shard" };
+  private static readonly uint[] _shardStatsFieldTags = new uint[] { 16, 10 };
+  public static ShardStats DefaultInstance {
+    get { return defaultInstance; }
+  }
+  
+  public override ShardStats DefaultInstanceForType {
+    get { return DefaultInstance; }
+  }
+  
+  protected override ShardStats ThisMessage {
+    get { return this; }
+  }
+  
+  public static pbd::MessageDescriptor Descriptor {
+    get { return global::ClusterShardingMessages.internal__static_ShardStats__Descriptor; }
+  }
+  
+  protected override pb::FieldAccess.FieldAccessorTable<ShardStats, ShardStats.Builder> InternalFieldAccessors {
+    get { return global::ClusterShardingMessages.internal__static_ShardStats__FieldAccessorTable; }
+  }
+  
+  public const int ShardFieldNumber = 1;
+  private bool hasShard;
+  private string shard_ = "";
+  public bool HasShard {
+    get { return hasShard; }
+  }
+  public string Shard {
+    get { return shard_; }
+  }
+  
+  public const int EntityCountFieldNumber = 2;
+  private bool hasEntityCount;
+  private int entityCount_;
+  public bool HasEntityCount {
+    get { return hasEntityCount; }
+  }
+  public int EntityCount {
+    get { return entityCount_; }
+  }
+  
+  public override bool IsInitialized {
+    get {
+      if (!hasShard) return false;
+      if (!hasEntityCount) return false;
+      return true;
+    }
+  }
+  
+  public override void WriteTo(pb::ICodedOutputStream output) {
+    int size = SerializedSize;
+    string[] field_names = _shardStatsFieldNames;
+    if (hasShard) {
+      output.WriteString(1, field_names[1], Shard);
+    }
+    if (hasEntityCount) {
+      output.WriteInt32(2, field_names[0], EntityCount);
+    }
+    UnknownFields.WriteTo(output);
+  }
+  
+  private int memoizedSerializedSize = -1;
+  public override int SerializedSize {
+    get {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+      
+      size = 0;
+      if (hasShard) {
+        size += pb::CodedOutputStream.ComputeStringSize(1, Shard);
+      }
+      if (hasEntityCount) {
+        size += pb::CodedOutputStream.ComputeInt32Size(2, EntityCount);
+      }
+      size += UnknownFields.SerializedSize;
+      memoizedSerializedSize = size;
+      return size;
+    }
+  }
+  
+  public static ShardStats ParseFrom(pb::ByteString data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(byte[] data) {
+    return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(global::System.IO.Stream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  public static ShardStats ParseDelimitedFrom(global::System.IO.Stream input) {
+    return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+  }
+  public static ShardStats ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+    return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+  }
+  public static ShardStats ParseFrom(pb::ICodedInputStream input) {
+    return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+  }
+  public static ShardStats ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+    return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+  }
+  private ShardStats MakeReadOnly() {
+    return this;
+  }
+  
+  public static Builder CreateBuilder() { return new Builder(); }
+  public override Builder ToBuilder() { return CreateBuilder(this); }
+  public override Builder CreateBuilderForType() { return new Builder(); }
+  public static Builder CreateBuilder(ShardStats prototype) {
+    return new Builder(prototype);
+  }
+  
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  public sealed partial class Builder : pb::GeneratedBuilder<ShardStats, Builder> {
+    protected override Builder ThisBuilder {
+      get { return this; }
+    }
+    public Builder() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+    }
+    internal Builder(ShardStats cloneFrom) {
+      result = cloneFrom;
+      resultIsReadOnly = true;
+    }
+    
+    private bool resultIsReadOnly;
+    private ShardStats result;
+    
+    private ShardStats PrepareBuilder() {
+      if (resultIsReadOnly) {
+        ShardStats original = result;
+        result = new ShardStats();
+        resultIsReadOnly = false;
+        MergeFrom(original);
+      }
+      return result;
+    }
+    
+    public override bool IsInitialized {
+      get { return result.IsInitialized; }
+    }
+    
+    protected override ShardStats MessageBeingBuilt {
+      get { return PrepareBuilder(); }
+    }
+    
+    public override Builder Clear() {
+      result = DefaultInstance;
+      resultIsReadOnly = true;
+      return this;
+    }
+    
+    public override Builder Clone() {
+      if (resultIsReadOnly) {
+        return new Builder(result);
+      } else {
+        return new Builder().MergeFrom(result);
+      }
+    }
+    
+    public override pbd::MessageDescriptor DescriptorForType {
+      get { return global::ShardStats.Descriptor; }
+    }
+    
+    public override ShardStats DefaultInstanceForType {
+      get { return global::ShardStats.DefaultInstance; }
+    }
+    
+    public override ShardStats BuildPartial() {
+      if (resultIsReadOnly) {
+        return result;
+      }
+      resultIsReadOnly = true;
+      return result.MakeReadOnly();
+    }
+    
+    public override Builder MergeFrom(pb::IMessage other) {
+      if (other is ShardStats) {
+        return MergeFrom((ShardStats) other);
+      } else {
+        base.MergeFrom(other);
+        return this;
+      }
+    }
+    
+    public override Builder MergeFrom(ShardStats other) {
+      if (other == global::ShardStats.DefaultInstance) return this;
+      PrepareBuilder();
+      if (other.HasShard) {
+        Shard = other.Shard;
+      }
+      if (other.HasEntityCount) {
+        EntityCount = other.EntityCount;
+      }
+      this.MergeUnknownFields(other.UnknownFields);
+      return this;
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input) {
+      return MergeFrom(input, pb::ExtensionRegistry.Empty);
+    }
+    
+    public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      PrepareBuilder();
+      pb::UnknownFieldSet.Builder unknownFields = null;
+      uint tag;
+      string field_name;
+      while (input.ReadTag(out tag, out field_name)) {
+        if(tag == 0 && field_name != null) {
+          int field_ordinal = global::System.Array.BinarySearch(_shardStatsFieldNames, field_name, global::System.StringComparer.Ordinal);
+          if(field_ordinal >= 0)
+            tag = _shardStatsFieldTags[field_ordinal];
+          else {
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            continue;
+          }
+        }
+        switch (tag) {
+          case 0: {
+            throw pb::InvalidProtocolBufferException.InvalidTag();
+          }
+          default: {
+            if (pb::WireFormat.IsEndGroupTag(tag)) {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            if (unknownFields == null) {
+              unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+            }
+            ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name);
+            break;
+          }
+          case 10: {
+            result.hasShard = input.ReadString(ref result.shard_);
+            break;
+          }
+          case 16: {
+            result.hasEntityCount = input.ReadInt32(ref result.entityCount_);
+            break;
+          }
+        }
+      }
+      
+      if (unknownFields != null) {
+        this.UnknownFields = unknownFields.Build();
+      }
+      return this;
+    }
+    
+    
+    public bool HasShard {
+      get { return result.hasShard; }
+    }
+    public string Shard {
+      get { return result.Shard; }
+      set { SetShard(value); }
+    }
+    public Builder SetShard(string value) {
+      pb::ThrowHelper.ThrowIfNull(value, "value");
+      PrepareBuilder();
+      result.hasShard = true;
+      result.shard_ = value;
+      return this;
+    }
+    public Builder ClearShard() {
+      PrepareBuilder();
+      result.hasShard = false;
+      result.shard_ = "";
+      return this;
+    }
+    
+    public bool HasEntityCount {
+      get { return result.hasEntityCount; }
+    }
+    public int EntityCount {
+      get { return result.EntityCount; }
+      set { SetEntityCount(value); }
+    }
+    public Builder SetEntityCount(int value) {
+      PrepareBuilder();
+      result.hasEntityCount = true;
+      result.entityCount_ = value;
+      return this;
+    }
+    public Builder ClearEntityCount() {
+      PrepareBuilder();
+      result.hasEntityCount = false;
+      result.entityCount_ = 0;
+      return this;
+    }
+  }
+  static ShardStats() {
+    object.ReferenceEquals(global::ClusterShardingMessages.Descriptor, null);
+  }
 }
 
 #endregion
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Shard.cs b/src/contrib/cluster/Akka.Cluster.Sharding/Shard.cs
index de9bd4746d8..a0c787b0355 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Shard.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Shard.cs
@@ -23,14 +23,14 @@ public abstract class Shard : PersistentActor
     {
         #region messages
 
-        public interface IShardCommand { }
+        protected interface IShardCommand { }
         public interface IShardQuery { }
 
         /// <summary>
         /// When a <see cref="StateChange"/> fails to write to the journal, we will retry it after a back off.
         /// </summary>
         [Serializable]
-        public class RetryPersistence : IShardCommand
+        internal protected class RetryPersistence : IShardCommand
         {
             public readonly StateChange Payload;
 
@@ -44,7 +44,7 @@ public RetryPersistence(StateChange payload)
         /// The Snapshot tick for the shards.
         /// </summary>
         [Serializable]
-        public sealed class SnapshotTick : IShardCommand
+        internal protected sealed class SnapshotTick : IShardCommand
         {
             public static readonly SnapshotTick Instance = new SnapshotTick();
 
@@ -54,11 +54,11 @@ private SnapshotTick()
         }
 
         /// <summary>
-        /// When an remembering entries and the entity stops without issuing a <see cref="Passivate"/>, 
+        /// When an remembering entries and the entity stops without issuing a <see cref="Shard.Passivate"/>, 
         /// we restart it after a back off using this message.
         /// </summary>
         [Serializable]
-        public sealed class RestartEntity : IShardCommand
+        internal protected sealed class RestartEntity : IShardCommand
         {
             public readonly EntityId EntityId;
 
@@ -68,7 +68,7 @@ public RestartEntity(string entityId)
             }
         }
 
-        public abstract class StateChange
+        internal protected abstract class StateChange
         {
             public readonly EntityId EntityId;
 
@@ -82,7 +82,7 @@ protected StateChange(EntityId entityId)
         /// <see cref="ShardState"/> change for starting an entity in this `Shard`
         /// </summary>
         [Serializable]
-        public sealed class EntityStarted : StateChange
+        internal protected sealed class EntityStarted : StateChange
         {
             public EntityStarted(string entityId) : base(entityId)
             {
@@ -93,7 +93,7 @@ public EntityStarted(string entityId) : base(entityId)
         /// <see cref="ShardState"/> change for an entity which has terminated.
         /// </summary>
         [Serializable]
-        public sealed class EntityStopped : StateChange
+        internal protected sealed class EntityStopped : StateChange
         {
             public EntityStopped(string entityId) : base(entityId)
             {
@@ -152,7 +152,7 @@ public ShardStats(string shardId, int entityCount)
         /// Persistent state of the Shard.
         /// </summary>
         [Serializable]
-        public struct ShardState : IClusterShardingSerializable
+        internal protected struct ShardState : IClusterShardingSerializable
         {
             public static readonly ShardState Empty = new ShardState(ImmutableHashSet<string>.Empty);
             public readonly IImmutableSet<EntityId> Entries;
@@ -216,7 +216,7 @@ protected int TotalBufferSize
 
         protected virtual void Initialized()
         {
-            Context.Parent.Tell(new ShardRegion.ShardInitialized(ShardId));
+            Context.Parent.Tell(new ShardInitialized(ShardId));
         }
 
         protected virtual void ProcessChange<T>(T evt, Action<T> handler)
@@ -229,7 +229,7 @@ protected bool HandleCommand(object message)
             if (message is Terminated) HandleTerminated(((Terminated) message).ActorRef);
             else if (message is PersistentShardCoordinator.ICoordinatorMessage) HandleCoordinatorMessage(message as PersistentShardCoordinator.ICoordinatorMessage);
             else if (message is IShardCommand) HandleShardCommand(message as IShardCommand);
-            else if (message is ShardRegion.IShardRegionCommand) HandleShardRegionCommand(message as ShardRegion.IShardRegionCommand);
+            else if (message is IShardRegionCommand) HandleShardRegionCommand(message as IShardRegionCommand);
             else if (message is IShardQuery) HandleShardRegionQuery(message as IShardQuery);
             else if (ExtractEntityId(message) != null) DeliverMessage(message, Sender);
             else return false;
@@ -259,23 +259,23 @@ protected virtual void EntityTerminated(IActorRef tref)
             Passivating = Passivating.Remove(tref);
         }
 
-        protected void HandleShardCommand(IShardCommand message)
+        private void HandleShardCommand(IShardCommand message)
         {
             var restart = message as RestartEntity;
             if (restart != null)
                 GetEntity(restart.EntityId);
         }
 
-        protected void HandleShardRegionCommand(ShardRegion.IShardRegionCommand message)
+        private void HandleShardRegionCommand(IShardRegionCommand message)
         {
-            var passivate = message as ShardRegion.Passivate;
+            var passivate = message as Passivate;
             if (passivate != null)
                 Passivate(Sender, passivate.StopMessage);
             else
                 Unhandled(message);
         }
 
-        protected void HandleCoordinatorMessage(PersistentShardCoordinator.ICoordinatorMessage message)
+        private void HandleCoordinatorMessage(PersistentShardCoordinator.ICoordinatorMessage message)
         {
             var handOff = message as PersistentShardCoordinator.HandOff;
             if (handOff != null)
@@ -286,7 +286,7 @@ protected void HandleCoordinatorMessage(PersistentShardCoordinator.ICoordinatorM
             else Unhandled(message);
         }
 
-        protected void HandOff(IActorRef replyTo)
+        private void HandOff(IActorRef replyTo)
         {
             if (HandOffStopper != null) Log.Warning("HandOff shard [{0}] received during existing handOff", ShardId);
             else
@@ -320,7 +320,7 @@ protected void HandOff(IActorRef replyTo)
             }
         }
 
-        protected void HandleTerminated(IActorRef terminatedRef)
+        private void HandleTerminated(IActorRef terminatedRef)
         {
             if (Equals(HandOffStopper, terminatedRef))
                 Context.Stop(Self);
@@ -328,7 +328,7 @@ protected void HandleTerminated(IActorRef terminatedRef)
                 EntityTerminated(terminatedRef);
         }
 
-        protected void Passivate(IActorRef entity, object stopMessage)
+        private void Passivate(IActorRef entity, object stopMessage)
         {
             ShardId id;
             if (IdByRef.TryGetValue(entity, out id) && !MessageBuffers.ContainsKey(id))
@@ -376,7 +376,7 @@ protected void SendMessageBuffer(EntityStarted message)
             }
         }
 
-        protected void DeliverMessage(object message, IActorRef sender)
+        private void DeliverMessage(object message, IActorRef sender)
         {
             var t = ExtractEntityId(message);
             var id = t.Item1;
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardRegion.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardRegion.cs
index 0c12ae80949..906ebfa323b 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/ShardRegion.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ShardRegion.cs
@@ -6,7 +6,6 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Akka.Actor;
 using System.Collections.Immutable;
@@ -29,213 +28,20 @@ namespace Akka.Cluster.Sharding
     public class ShardRegion : ActorBase
     {
         #region messages
-
-        public interface IShardRegionCommand { }
-        public interface IShardRegionQuery { }
-
-        /// <summary>
-        /// If the state of the entries are persistent you may stop entries that are not used to
-        /// reduce memory consumption. This is done by the application specific implementation of
-        /// the entity actors for example by defining receive timeout (<see cref="IActorContext.SetReceiveTimeout"/>).
-        /// If a message is already enqueued to the entity when it stops itself the enqueued message
-        /// in the mailbox will be dropped. To support graceful passivation without loosing such
-        /// messages the entity actor can send this <see cref="Passivate"/> message to its parent <see cref="ShardRegion"/>.
-        /// The specified wrapped <see cref="StopMessage"/> will be sent back to the entity, which is
-        /// then supposed to stop itself. Incoming messages will be buffered by the `ShardRegion`
-        /// between reception of <see cref="Passivate"/> and termination of the entity. Such buffered messages
-        /// are thereafter delivered to a new incarnation of the entity.
-        /// 
-        /// <see cref="PoisonPill"/> is a perfectly fine <see cref="StopMessage"/>.
-        /// </summary>
-        [Serializable]
-        public sealed class Passivate : IShardRegionCommand
-        {
-            public Passivate(object stopMessage)
-            {
-                StopMessage = stopMessage;
-            }
-
-            public object StopMessage { get; private set; }
-        }
-
-        /// <summary>
-        /// Send this message to the <see cref="ShardRegion"/> actor to handoff all shards that are hosted by
-        /// the <see cref="ShardRegion"/> and then the <see cref="ShardRegion"/> actor will be stopped. You can <see cref="ICanWatch.Watch"/>
-        /// it to know when it is completed.
-        /// </summary>
-        [Serializable]
-        public sealed class GracefulShutdown : IShardRegionCommand
-        {
-            public static readonly GracefulShutdown Instance = new GracefulShutdown();
-
-            private GracefulShutdown()
-            {
-            }
-        }
-
+        
         [Serializable]
-        public sealed class Retry : IShardRegionCommand
+        internal sealed class Retry : IShardRegionCommand
         {
             public static readonly Retry Instance = new Retry();
             private Retry() { }
         }
 
-        /// <summary>
-        /// We must be sure that a shard is initialized before to start send messages to it.
-        /// Shard could be terminated during initialization.
-        /// </summary>
-        [Serializable]
-        public sealed class ShardInitialized
-        {
-            public readonly ShardId ShardId;
-
-            public ShardInitialized(ShardId shardId)
-            {
-                ShardId = shardId;
-            }
-        }
-
-        /// <summary>
-        /// Send this message to the <see cref="ShardRegion"/> actor to request for <see cref="CurrentRegions"/>,
-        /// which contains the addresses of all registered regions.
-        /// Intended for testing purpose to see when cluster sharding is "ready".
-        /// </summary>
-        [Serializable]
-        public sealed class GetCurrentRegions : IShardRegionQuery
-        {
-            public static readonly GetCurrentRegions Instance = new GetCurrentRegions();
-
-            private GetCurrentRegions()
-            {
-            }
-        }
-
-        /// <summary>
-        /// Reply to <see cref="GetCurrentRegions"/>.
-        /// </summary>
-        [Serializable]
-        public sealed class CurrentRegions
-        {
-            public readonly Address[] Regions;
-            public CurrentRegions(Address[] regions)
-            {
-                Regions = regions;
-            }
-        }
-
-        /// <summary>
-        /// Send this message to the <see cref="ShardRegion"/> actor to request for <see cref="ClusterShardingStats"/>,
-        /// which contains statistics about the currently running sharded entities in the
-        /// entire cluster. If the `timeout` is reached without answers from all shard regions
-        /// the reply will contain an empty map of regions.
-        /// 
-        /// Intended for testing purpose to see when cluster sharding is "ready" or to monitor
-        /// the state of the shard regions.
-        /// </summary>
-        [Serializable]
-        public sealed class GetClusterShardingStats : IShardRegionQuery
-        {
-            public readonly TimeSpan Timeout;
-
-            public GetClusterShardingStats(TimeSpan timeout)
-            {
-                Timeout = timeout;
-            }
-        }
-
-        /// <summary>
-        /// Reply to <see cref="GetClusterShardingStats"/>, contains statistics about all the sharding regions in the cluster.
-        /// </summary>
-        [Serializable]
-        public sealed class ClusterShardingStats
-        {
-            public readonly IDictionary<Address, ShardRegionStats> Regions;
-
-            public ClusterShardingStats(IDictionary<Address, ShardRegionStats> regions)
-            {
-                Regions = regions;
-            }
-        }
-
-        /// <summary>
-        /// Send this message to the `ShardRegion` actor to request for <see cref="ShardRegionStats"/>,
-        /// which contains statistics about the currently running sharded entities in the
-        /// entire region.
-        /// Intended for testing purpose to see when cluster sharding is "ready" or to monitor
-        /// the state of the shard regions.
-        /// 
-        /// For the statistics for the entire cluster, see <see cref="GetClusterShardingStats$"/>.
-        /// </summary>
-        [Serializable]
-        public sealed class GetShardRegionStats : IShardRegionQuery
-        {
-            public static readonly GetShardRegionStats Instance = new GetShardRegionStats();
-
-            private GetShardRegionStats()
-            {
-            }
-        }
-
-        [Serializable]
-        public sealed class ShardRegionStats
-        {
-            public readonly IDictionary<ShardId, int> Stats;
-
-            public ShardRegionStats(IDictionary<string, int> stats)
-            {
-                Stats = stats;
-            }
-        }
-
-        /// <summary>
-        /// Send this message to a <see cref="ShardRegion"/> actor instance to request a
-        /// <see cref="CurrentShardRegionState"/> which describes the current state of the region.
-        /// The state contains information about what shards are running in this region
-        /// and what entities are running on each of those shards.
-        /// </summary>
-        [Serializable]
-        public sealed class GetShardRegionState : IShardRegionQuery
-        {
-            public static readonly GetShardRegionState Instance = new GetShardRegionState();
-
-            private GetShardRegionState()
-            {
-            }
-        }
-
-        /// <summary>
-        /// Reply to <see cref="GetShardRegionState"/> If gathering the shard information times out the set of shards will be empty.
-        /// </summary>
-        [Serializable]
-        public sealed class CurrentShardRegionState
-        {
-            public readonly ISet<ShardState> Shards;
-
-            public CurrentShardRegionState(ISet<ShardState> shards)
-            {
-                Shards = shards;
-            }
-        }
-
-        [Serializable]
-        public sealed class ShardState
-        {
-            public readonly ShardId ShardId;
-            public readonly string[] EntityIds;
-
-            public ShardState(string shardId, string[] entityIds)
-            {
-                ShardId = shardId;
-                EntityIds = entityIds;
-            }
-        }
-
         /// <summary>
         /// When an remembering entities and the shard stops unexpected (e.g. persist failure), we
         /// restart it after a back off using this message.
         /// </summary>
         [Serializable]
-        public sealed class RestartShard
+        internal sealed class RestartShard
         {
             public readonly ShardId ShardId;
             public RestartShard(string shardId)
@@ -294,7 +100,7 @@ public int Compare(Member x, Member y)
         /// <summary>
         /// Factory method for the <see cref="Actor.Props"/> of the <see cref="ShardRegion"/> actor.
         /// </summary>
-        public static Props Props(string typeName, Props entityProps, ClusterShardingSettings settings, string coordinatorPath, IdExtractor extractEntityId, ShardResolver extractShardId, object handOffStopMessage)
+        internal static Props Props(string typeName, Props entityProps, ClusterShardingSettings settings, string coordinatorPath, IdExtractor extractEntityId, ShardResolver extractShardId, object handOffStopMessage)
         {
             return Actor.Props.Create(() => new ShardRegion(typeName, entityProps, settings, coordinatorPath, extractEntityId, extractShardId, handOffStopMessage)).WithDeploy(Deploy.Local);
         }
@@ -302,7 +108,7 @@ public static Props Props(string typeName, Props entityProps, ClusterShardingSet
         /// <summary>
         /// Factory method for the <see cref="Actor.Props"/> of the <see cref="ShardRegion"/> actor when used in proxy only mode.
         /// </summary>
-        public static Props ProxyProps(string typeName, ClusterShardingSettings settings, string coordinatorPath, IdExtractor extractEntityId, ShardResolver extractShardId)
+        internal static Props ProxyProps(string typeName, ClusterShardingSettings settings, string coordinatorPath, IdExtractor extractEntityId, ShardResolver extractShardId)
         {
             return Actor.Props.Create(() => new ShardRegion(typeName, null, settings, coordinatorPath, extractEntityId, extractShardId, PoisonPill.Instance)).WithDeploy(Deploy.Local);
         }
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
new file mode 100644
index 00000000000..9a49340c387
--- /dev/null
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ShardingMessages.cs
@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using Akka.Actor;
+
+namespace Akka.Cluster.Sharding
+{
+    public interface IShardRegionCommand { }
+    public interface IShardRegionQuery { }
+
+    /// <summary>
+    /// If the state of the entries are persistent you may stop entries that are not used to
+    /// reduce memory consumption. This is done by the application specific implementation of
+    /// the entity actors for example by defining receive timeout (<see cref="IActorContext.SetReceiveTimeout"/>).
+    /// If a message is already enqueued to the entity when it stops itself the enqueued message
+    /// in the mailbox will be dropped. To support graceful passivation without loosing such
+    /// messages the entity actor can send this <see cref="Passivate"/> message to its parent <see cref="ShardRegion"/>.
+    /// The specified wrapped <see cref="StopMessage"/> will be sent back to the entity, which is
+    /// then supposed to stop itself. Incoming messages will be buffered by the `ShardRegion`
+    /// between reception of <see cref="Passivate"/> and termination of the entity. Such buffered messages
+    /// are thereafter delivered to a new incarnation of the entity.
+    /// 
+    /// <see cref="PoisonPill"/> is a perfectly fine <see cref="StopMessage"/>.
+    /// </summary>
+    [Serializable]
+    public sealed class Passivate : IShardRegionCommand
+    {
+        public Passivate(object stopMessage)
+        {
+            StopMessage = stopMessage;
+        }
+
+        public object StopMessage { get; private set; }
+    }
+
+    /// <summary>
+    /// Send this message to the <see cref="ShardRegion"/> actor to handoff all shards that are hosted by
+    /// the <see cref="ShardRegion"/> and then the <see cref="ShardRegion"/> actor will be stopped. You can <see cref="ICanWatch.Watch"/>
+    /// it to know when it is completed.
+    /// </summary>
+    [Serializable]
+    public sealed class GracefulShutdown : IShardRegionCommand
+    {
+        public static readonly GracefulShutdown Instance = new GracefulShutdown();
+
+        private GracefulShutdown()
+        {
+        }
+    }
+
+    /// <summary>
+    /// We must be sure that a shard is initialized before to start send messages to it.
+    /// Shard could be terminated during initialization.
+    /// </summary>
+    [Serializable]
+    public sealed class ShardInitialized
+    {
+        public readonly string ShardId;
+
+        public ShardInitialized(string shardId)
+        {
+            ShardId = shardId;
+        }
+    }
+
+    /// <summary>
+    /// Send this message to the <see cref="ShardRegion"/> actor to request for <see cref="CurrentRegions"/>,
+    /// which contains the addresses of all registered regions.
+    /// Intended for testing purpose to see when cluster sharding is "ready".
+    /// </summary>
+    [Serializable]
+    public sealed class GetCurrentRegions : IShardRegionQuery
+    {
+        public static readonly GetCurrentRegions Instance = new GetCurrentRegions();
+
+        private GetCurrentRegions()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Reply to <see cref="GetCurrentRegions"/>.
+    /// </summary>
+    [Serializable]
+    public sealed class CurrentRegions
+    {
+        public readonly Address[] Regions;
+        public CurrentRegions(Address[] regions)
+        {
+            Regions = regions;
+        }
+    }
+
+    /// <summary>
+    /// Send this message to the <see cref="ShardRegion"/> actor to request for <see cref="ClusterShardingStats"/>,
+    /// which contains statistics about the currently running sharded entities in the
+    /// entire cluster. If the `timeout` is reached without answers from all shard regions
+    /// the reply will contain an empty map of regions.
+    /// 
+    /// Intended for testing purpose to see when cluster sharding is "ready" or to monitor
+    /// the state of the shard regions.
+    /// </summary>
+    [Serializable]
+    public sealed class GetClusterShardingStats : IShardRegionQuery
+    {
+        public readonly TimeSpan Timeout;
+
+        public GetClusterShardingStats(TimeSpan timeout)
+        {
+            Timeout = timeout;
+        }
+    }
+
+    /// <summary>
+    /// Reply to <see cref="GetClusterShardingStats"/>, contains statistics about all the sharding regions in the cluster.
+    /// </summary>
+    [Serializable]
+    public sealed class ClusterShardingStats
+    {
+        public readonly IDictionary<Address, ShardRegionStats> Regions;
+
+        public ClusterShardingStats(IDictionary<Address, ShardRegionStats> regions)
+        {
+            Regions = regions;
+        }
+    }
+
+    /// <summary>
+    /// Send this message to the `ShardRegion` actor to request for <see cref="ShardRegionStats"/>,
+    /// which contains statistics about the currently running sharded entities in the
+    /// entire region.
+    /// Intended for testing purpose to see when cluster sharding is "ready" or to monitor
+    /// the state of the shard regions.
+    /// 
+    /// For the statistics for the entire cluster, see <see cref="GetClusterShardingStats$"/>.
+    /// </summary>
+    [Serializable]
+    public sealed class GetShardRegionStats : IShardRegionQuery
+    {
+        public static readonly GetShardRegionStats Instance = new GetShardRegionStats();
+
+        private GetShardRegionStats()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Send this message to a <see cref="ShardRegion"/> actor instance to request a
+    /// <see cref="CurrentShardRegionState"/> which describes the current state of the region.
+    /// The state contains information about what shards are running in this region
+    /// and what entities are running on each of those shards.
+    /// </summary>
+    [Serializable]
+    public sealed class GetShardRegionState : IShardRegionQuery
+    {
+        public static readonly GetShardRegionState Instance = new GetShardRegionState();
+
+        private GetShardRegionState()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Reply to <see cref="GetShardRegionState"/> If gathering the shard information times out the set of shards will be empty.
+    /// </summary>
+    [Serializable]
+    public sealed class CurrentShardRegionState
+    {
+        public readonly ISet<ShardState> Shards;
+
+        public CurrentShardRegionState(ISet<ShardState> shards)
+        {
+            Shards = shards;
+        }
+    }
+
+    [Serializable]
+    public sealed class ShardRegionStats
+    {
+        public readonly IDictionary<string, int> Stats;
+
+        public ShardRegionStats(IDictionary<string, int> stats)
+        {
+            Stats = stats;
+        }
+    }
+
+    [Serializable]
+    public sealed class ShardState
+    {
+        public readonly string ShardId;
+        public readonly string[] EntityIds;
+
+        public ShardState(string shardId, string[] entityIds)
+        {
+            ShardId = shardId;
+            EntityIds = entityIds;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorSpec.cs
index 0de15f76cd0..69155d3e734 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorSpec.cs
@@ -145,13 +145,13 @@ public class TestChatUser : ReceiveActor
         {
             public TestChatUser(IActorRef mediator, IActorRef testActorRef)
             {
-                Receive<Whisper>(w => mediator.Tell(new Distributed.Send(w.Path, w.Message, true)));
-                Receive<Talk>(t => mediator.Tell(new Distributed.SendToAll(t.Path, t.Message)));
-                Receive<TalkToOthers>(t => mediator.Tell(new Distributed.SendToAll(t.Path, t.Message, true)));
-                Receive<Shout>(s => mediator.Tell(new Distributed.Publish(s.Topic, s.Message)));
-                Receive<ShoutToGroup>(s => mediator.Tell(new Distributed.Publish(s.Topic, s.Message, true)));
-                Receive<JoinGroup>(j => mediator.Tell(new Distributed.Subscribe(j.Topic, Self, j.Group)));
-                Receive<ExitGroup>(j => mediator.Tell(new Distributed.Unsubscribe(j.Topic, Self, j.Group)));
+                Receive<Whisper>(w => mediator.Tell(new Send(w.Path, w.Message, true)));
+                Receive<Talk>(t => mediator.Tell(new SendToAll(t.Path, t.Message)));
+                Receive<TalkToOthers>(t => mediator.Tell(new SendToAll(t.Path, t.Message, true)));
+                Receive<Shout>(s => mediator.Tell(new Publish(s.Topic, s.Message)));
+                Receive<ShoutToGroup>(s => mediator.Tell(new Publish(s.Topic, s.Message, true)));
+                Receive<JoinGroup>(j => mediator.Tell(new Subscribe(j.Topic, Self, j.Group)));
+                Receive<ExitGroup>(j => mediator.Tell(new Unsubscribe(j.Topic, Self, j.Group)));
                 ReceiveAny(msg => testActorRef.Tell(msg));
             }
         }
@@ -161,7 +161,7 @@ public class Publisher : ReceiveActor
             public Publisher()
             {
                 var mediator = DistributedPubSub.Get(Context.System).Mediator;
-                Receive<string>(input => mediator.Tell(new Distributed.Publish("content", input.ToUpperInvariant())));
+                Receive<string>(input => mediator.Tell(new Publish("content", input.ToUpperInvariant())));
             }
         }
 
@@ -174,12 +174,12 @@ public Subscriber()
             {
                 _log = Context.GetLogger();
                 _mediator = DistributedPubSub.Get(Context.System).Mediator;
-                _mediator.Tell(new Distributed.Subscribe("content", Self));
+                _mediator.Tell(new Subscribe("content", Self));
             }
 
             protected override void OnReceive(object message)
             {
-                var ack = message as Distributed.SubscribeAck;
+                var ack = message as SubscribeAck;
                 if (ack != null && ack.Subscribe.Topic == "content" && ack.Subscribe.Ref.Equals(Self))
                 {
                     Context.Become(Ready);
@@ -271,9 +271,9 @@ public void DistributedPubSubMediator_should_keep_track_of_added_users()
                 RunOn(() =>
                 {
                     var u1 = CreateChatUser("u1");
-                    Mediator.Tell(new Distributed.Put(u1));
+                    Mediator.Tell(new Put(u1));
                     var u2 = CreateChatUser("u2");
-                    Mediator.Tell(new Distributed.Put(u2));
+                    Mediator.Tell(new Put(u2));
 
                     AwaitCount(2);
 
@@ -286,7 +286,7 @@ public void DistributedPubSubMediator_should_keep_track_of_added_users()
                 RunOn(() =>
                 {
                     var u3 = CreateChatUser("u3");
-                    Mediator.Tell(new Distributed.Put(u3));
+                    Mediator.Tell(new Put(u3));
                 }, _second);
 
                 RunOn(() =>
@@ -298,7 +298,7 @@ public void DistributedPubSubMediator_should_keep_track_of_added_users()
                 RunOn(() =>
                 {
                     var u4 = CreateChatUser("u4");
-                    Mediator.Tell(new Distributed.Put(u4));
+                    Mediator.Tell(new Put(u4));
                 }, _second);
 
                 RunOn(() =>
@@ -333,7 +333,7 @@ public void DistributedPubSubMediator_should_replicate_users_to_new_node()
                 RunOn(() =>
                 {
                     var u5 = CreateChatUser("u5");
-                    Mediator.Tell(new Distributed.Put(u5));
+                    Mediator.Tell(new Put(u5));
                 }, _third);
 
                 AwaitCount(5);
@@ -361,14 +361,14 @@ public void DistributedPubSubMediator_should_keep_track_of_removed_users()
             Within(TimeSpan.FromSeconds(15), () =>
             {
                 var u6 = CreateChatUser("u6");
-                Mediator.Tell(new Distributed.Put(u6));
+                Mediator.Tell(new Put(u6));
             });
             AwaitCount(6);
             EnterBarrier("6-registered");
 
             RunOn(() =>
             {
-                Mediator.Tell(new Distributed.Remove("/user/u6"));
+                Mediator.Tell(new Remove("/user/u6"));
             }, _first);
             AwaitCount(5);
             EnterBarrier("after-4");
@@ -401,7 +401,7 @@ public void DistributedPubSubMediator_should_publish()
                 RunOn(() =>
                 {
                     var u7 = CreateChatUser("u7");
-                    Mediator.Tell(new Distributed.Put(u7));
+                    Mediator.Tell(new Put(u7));
                 }, _first, _second);
                 AwaitCount(6);
                 EnterBarrier("7-registered");
@@ -434,19 +434,19 @@ public void DistributedPubSubMediator_should_publish_to_topic()
             {
                 RunOn(() =>
                 {
-                    var s8 = new Distributed.Subscribe("topic1", CreateChatUser("u8"));
+                    var s8 = new Subscribe("topic1", CreateChatUser("u8"));
                     Mediator.Tell(s8);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s8));
-                    var s9 = new Distributed.Subscribe("topic1", CreateChatUser("u9"));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s8));
+                    var s9 = new Subscribe("topic1", CreateChatUser("u9"));
                     Mediator.Tell(s9);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s9));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s9));
                 }, _first);
 
                 RunOn(() =>
                 {
-                    var s10 = new Distributed.Subscribe("topic1", CreateChatUser("u10"));
+                    var s10 = new Subscribe("topic1", CreateChatUser("u10"));
                     Mediator.Tell(s10);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s10));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s10));
                 }, _second);
 
                 // one topic on two nodes
@@ -517,7 +517,7 @@ public void DistributedPubSubMediator_should_SendAll_to_all_other_nodes()
                 RunOn(() =>
                 {
                     var u11 = CreateChatUser("u11");
-                    Mediator.Tell(new Distributed.Put(u11));
+                    Mediator.Tell(new Put(u11));
                 }, _first, _second, _third);
                 AwaitCount(13);
                 EnterBarrier("11-registered");
@@ -552,7 +552,7 @@ public void DistributedPubSubMediator_should_send_one_message_to_each_group()
                 {
                     var u12 = CreateChatUser("u12");
                     u12.Tell(new JoinGroup("topic2", "group1"));
-                    ExpectMsg<Distributed.SubscribeAck>(s => s.Subscribe.Topic == "topic2"
+                    ExpectMsg<SubscribeAck>(s => s.Subscribe.Topic == "topic2"
                                                                            && s.Subscribe.Group == "group1"
                                                                            && s.Subscribe.Ref.Equals(u12));
                 }, _first);
@@ -561,13 +561,13 @@ public void DistributedPubSubMediator_should_send_one_message_to_each_group()
                 {
                     var u12 = CreateChatUser("u12");
                     u12.Tell(new JoinGroup("topic2", "group2"));
-                    ExpectMsg<Distributed.SubscribeAck>(s => s.Subscribe.Topic == "topic2"
+                    ExpectMsg<SubscribeAck>(s => s.Subscribe.Topic == "topic2"
                                                                            && s.Subscribe.Group == "group2"
                                                                            && s.Subscribe.Ref.Equals(u12));
 
                     var u13 = CreateChatUser("u13");
                     u12.Tell(new JoinGroup("topic2", "group2"));
-                    ExpectMsg<Distributed.SubscribeAck>(s => s.Subscribe.Topic == "topic2"
+                    ExpectMsg<SubscribeAck>(s => s.Subscribe.Topic == "topic2"
                                                                            && s.Subscribe.Group == "group2"
                                                                            && s.Subscribe.Ref.Equals(u13));
                 }, _second);
@@ -591,7 +591,7 @@ public void DistributedPubSubMediator_should_send_one_message_to_each_group()
                 {
                     var u12 = ChatUser("u12");
                     u12.Tell(new ExitGroup("topic2", "group1"));
-                    ExpectMsg<Distributed.UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
+                    ExpectMsg<UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
                                                                            && s.Unsubscribe.Group == "group1"
                                                                            && s.Unsubscribe.Ref.Equals(u12));
                 }, _first);
@@ -600,12 +600,12 @@ public void DistributedPubSubMediator_should_send_one_message_to_each_group()
                 {
                     var u12 = ChatUser("u12");
                     u12.Tell(new ExitGroup("topic2", "group2"));
-                    ExpectMsg<Distributed.UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
+                    ExpectMsg<UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
                                                                            && s.Unsubscribe.Group == "group2"
                                                                            && s.Unsubscribe.Ref.Equals(u12));
                     var u13 = ChatUser("u13");
                     u12.Tell(new ExitGroup("topic2", "group2"));
-                    ExpectMsg<Distributed.UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
+                    ExpectMsg<UnsubscribeAck>(s => s.Unsubscribe.Topic == "topic2"
                                                                            && s.Unsubscribe.Group == "group2"
                                                                            && s.Unsubscribe.Ref.Equals(u13));
                 }, _second);
@@ -639,7 +639,7 @@ public void DistributedPubSubMediator_should_transfer_delta_correctly()
             {
                 for (int i = 1; i <= many; i++)
                 {
-                    Mediator.Tell(new Distributed.Put(CreateChatUser("u" + (i + 1000))));
+                    Mediator.Tell(new Put(CreateChatUser("u" + (i + 1000))));
                 }
 
                 Mediator.Tell(new Tools.PublishSubscribe.Internal.Status(new Dictionary<Address, long>()));
@@ -700,12 +700,12 @@ public void DistributedPubSubMediator_should_receive_proper_UnsubscribeAck_messa
                 {
                     var user = CreateChatUser("u111");
                     var topic = "sample-topic-14";
-                    var s1 = new Distributed.Subscribe(topic, user);
+                    var s1 = new Subscribe(topic, user);
                     Mediator.Tell(s1);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s1));
-                    var uns = new Distributed.Unsubscribe(topic, user);
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s1));
+                    var uns = new Unsubscribe(topic, user);
                     Mediator.Tell(uns);
-                    ExpectMsg<Distributed.UnsubscribeAck>(x => x.Unsubscribe.Equals(uns));
+                    ExpectMsg<UnsubscribeAck>(x => x.Unsubscribe.Equals(uns));
                 }, _first);
                 EnterBarrier("after-15");
             });
@@ -720,33 +720,33 @@ public void DistributedPubSubMediator_should_get_topics_after_simple_publish()
             {
                 RunOn(() =>
                 {
-                    var s1 = new Distributed.Subscribe("topic_a1", CreateChatUser("u14"));
+                    var s1 = new Subscribe("topic_a1", CreateChatUser("u14"));
                     Mediator.Tell(s1);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s1));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s1));
 
-                    var s2 = new Distributed.Subscribe("topic_a1", CreateChatUser("u15"));
+                    var s2 = new Subscribe("topic_a1", CreateChatUser("u15"));
                     Mediator.Tell(s2);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s2));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s2));
 
-                    var s3 = new Distributed.Subscribe("topic_a2", CreateChatUser("u16"));
+                    var s3 = new Subscribe("topic_a2", CreateChatUser("u16"));
                     Mediator.Tell(s3);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s3));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s3));
 
                 }, _first);
 
                 RunOn(() =>
                 {
-                    var s3 = new Distributed.Subscribe("topic_a1", CreateChatUser("u17"));
+                    var s3 = new Subscribe("topic_a1", CreateChatUser("u17"));
                     Mediator.Tell(s3);
-                    ExpectMsg<Distributed.SubscribeAck>(x => x.Subscribe.Equals(s3));
+                    ExpectMsg<SubscribeAck>(x => x.Subscribe.Equals(s3));
 
                 }, _second);
                 EnterBarrier("topics-registered");
 
                 RunOn(() =>
                 {
-                    Mediator.Tell(Distributed.GetTopics.Instance);
-                    ExpectMsg<Distributed.CurrentTopics>(
+                    Mediator.Tell(GetTopics.Instance);
+                    ExpectMsg<CurrentTopics>(
                         x => x.Topics.Contains("topic_a1") && x.Topics.Contains("topic_a2"));
                 }, _first);
 
@@ -755,8 +755,8 @@ public void DistributedPubSubMediator_should_get_topics_after_simple_publish()
                     // topics will eventually be replicated
                     AwaitAssert(() =>
                     {
-                        Mediator.Tell(Distributed.GetTopics.Instance);
-                        var topics = ExpectMsg<Distributed.CurrentTopics>().Topics;
+                        Mediator.Tell(GetTopics.Instance);
+                        var topics = ExpectMsg<CurrentTopics>().Topics;
 
                         Assert.True(topics.Contains("topic_a1"));
                         Assert.True(topics.Contains("topic_a2"));
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClient.cs b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClient.cs
index a5467324168..387ec76e571 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClient.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClient.cs
@@ -211,9 +211,9 @@ private bool Establishing(object message)
                             break;
                     }
                 })
-               .With<Send>(send => Buffer(new Distributed.Send(send.Path, send.Message, send.LocalAffinity)))
-               .With<SendToAll>(send => Buffer(new Distributed.SendToAll(send.Path, send.Message)))
-               .With<Publish>(publish => Buffer(new Distributed.Publish(publish.Topic, publish.Message)))
+               .With<Send>(send => Buffer(new Send(send.Path, send.Message, send.LocalAffinity)))
+               .With<SendToAll>(send => Buffer(new SendToAll(send.Path, send.Message)))
+               .With<Publish>(publish => Buffer(new Publish(publish.Topic, publish.Message)))
                .WasHandled;
         }
 
@@ -222,11 +222,11 @@ private Receive Active(IActorRef receptionist)
             return message =>
                 message.Match()
                 .With<Send>(send =>
-                    receptionist.Forward(new Distributed.Send(send.Path, send.Message, send.LocalAffinity)))
+                    receptionist.Forward(new Send(send.Path, send.Message, send.LocalAffinity)))
                 .With<SendToAll>(toAll =>
-                    receptionist.Forward(new Distributed.SendToAll(toAll.Path, toAll.Message)))
+                    receptionist.Forward(new SendToAll(toAll.Path, toAll.Message)))
                 .With<Publish>(publish =>
-                    receptionist.Forward(new Distributed.Publish(publish.Topic, publish.Message)))
+                    receptionist.Forward(new Publish(publish.Topic, publish.Message)))
                 .With<InternalMessage>(m =>
                 {
                     switch (m)
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClientReceptionist.cs b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClientReceptionist.cs
index 25a684d43d6..abf2f53b8e0 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClientReceptionist.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterClientReceptionist.cs
@@ -75,12 +75,12 @@ public IActorRef PubSubMediator
 
         /// <summary>
         /// Register an actor that should be reachable for the clients. The clients can send messages to this actor with
-        /// <see cref="Distributed.Send"/> or <see cref="Distributed.SendToAll"/> using the path elements 
+        /// <see cref="Send"/> or <see cref="SendToAll"/> using the path elements 
         /// of the <see cref="IActorRef"/>, e.g. "/user/myservice".
         /// </summary>
         public void RegisterService(IActorRef actorRef)
         {
-            PubSubMediator.Tell(new Distributed.Put(actorRef));
+            PubSubMediator.Tell(new Put(actorRef));
         }
 
         /// <summary>
@@ -89,18 +89,18 @@ public void RegisterService(IActorRef actorRef)
         /// </summary>
         public void UnregisterService(IActorRef actorRef)
         {
-            PubSubMediator.Tell(new Distributed.Remove(actorRef.Path.ToStringWithoutAddress()));
+            PubSubMediator.Tell(new Remove(actorRef.Path.ToStringWithoutAddress()));
         }
 
         /// <summary>
         /// Register an actor that should be reachable for the clients to a named topic.
         /// Several actors can be registered to the same topic name, and all will receive
         /// published messages.
-        /// The client can publish messages to this topic with <see cref="Distributed.Publish"/>.
+        /// The client can publish messages to this topic with <see cref="Publish"/>.
         /// </summary>
         public void RegisterSubscriber(string topic, IActorRef actorRef)
         {
-            PubSubMediator.Tell(new Distributed.Subscribe(topic, actorRef));
+            PubSubMediator.Tell(new Subscribe(topic, actorRef));
         }
 
         /// <summary>
@@ -109,7 +109,7 @@ public void RegisterSubscriber(string topic, IActorRef actorRef)
         /// </summary>
         public void UnregisterSubscriber(string topic, IActorRef actorRef)
         {
-            PubSubMediator.Tell(new Distributed.Unsubscribe(topic, actorRef));
+            PubSubMediator.Tell(new Unsubscribe(topic, actorRef));
         }
 
         private IActorRef CreateReceptionist(Config config)
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterReceptionist.cs b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterReceptionist.cs
index 30bb8f1b824..ff7f8ba7d6a 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterReceptionist.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Client/ClusterReceptionist.cs
@@ -21,18 +21,16 @@ public interface IClusterClientMessage { }
 
     /// <summary>
     /// <para>
-    /// <see cref="ClusterClient"/> connects to this actor to retrieve. The `ClusterReceptionist` is
+    /// <see cref="ClusterClient"/> connects to this actor to retrieve. The <see cref="ClusterReceptionist"/> is
     /// supposed to be started on all nodes, or all nodes with specified role, in the cluster.
-    /// The receptionist can be started with the <see cref="ClusterClientReceptionist"/> or as an
+    /// The receptionist can be started with the <see cref="ClusterClientReceptionist.Get"/> or as an
     /// ordinary actor (use the factory method <see cref="ClusterReceptionist.Props"/>).
     /// </para>
     /// <para>
     /// The receptionist forwards messages from the client to the associated <see cref="DistributedPubSubMediator"/>,
     /// i.e. the client can send messages to any actor in the cluster that is registered in the
-    /// `DistributedPubSubMediator`. Messages from the client are wrapped in
-    /// <see cref="Distributed.Send"/>, <see cref="Distributed.SendToAll"/>
-    /// or <see cref="Distributed.Publish"/> with the semantics described in
-    /// <see cref="Distributed"/>.
+    /// <see cref="DistributedPubSubMediator"/>. Messages from the client are wrapped in <see cref="Send"/>, <see cref="SendToAll"/>
+    /// or <see cref="Publish"/> with the semantics described in distributed publish/subscribe.
     /// </para>
     /// <para>
     /// Response messages from the destination actor are tunneled via the receptionist
@@ -48,14 +46,14 @@ public class ClusterReceptionist : ActorBase
         #region Messages
 
         [Serializable]
-        public sealed class GetContacts : IClusterClientMessage
+        internal sealed class GetContacts : IClusterClientMessage
         {
             public static readonly GetContacts Instance = new GetContacts();
             private GetContacts() { }
         }
 
         [Serializable]
-        public sealed class Contacts : IClusterClientMessage
+        internal sealed class Contacts : IClusterClientMessage
         {
             public readonly string[] ContactPoints;
 
@@ -66,21 +64,21 @@ public Contacts(string[] contactPoints)
         }
 
         [Serializable]
-        public sealed class Heartbeat : IClusterClientMessage
+        internal sealed class Heartbeat : IClusterClientMessage
         {
             public static readonly Heartbeat Instance = new Heartbeat();
             private Heartbeat() { }
         }
 
         [Serializable]
-        public sealed class HeartbeatRsp : IClusterClientMessage
+        internal sealed class HeartbeatRsp : IClusterClientMessage
         {
             public static readonly HeartbeatRsp Instance = new HeartbeatRsp();
             private HeartbeatRsp() { }
         }
 
         [Serializable]
-        public sealed class Ping
+        internal sealed class Ping
         {
             public static readonly Ping Instance = new Ping();
             private Ping() { }
@@ -145,7 +143,7 @@ public ClusterReceptionist(IActorRef pubSubMediator, ClusterReceptionistSettings
 
         protected override bool Receive(object message)
         {
-            if (message is Distributed.Send || message is Distributed.SendToAll || message is Distributed.Publish)
+            if (message is Send || message is SendToAll || message is Publish)
             {
                 var tunnel = ResponseTunnel(Sender);
                 tunnel.Tell(Ping.Instance);
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
index 403721cd645..f4e89ba03c2 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
@@ -13,6 +13,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: InternalsVisibleTo("Akka.Cluster.Tools.Tests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedMessages.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedMessages.cs
index cdae6fb6336..5123cedd2d4 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedMessages.cs
@@ -10,429 +10,421 @@
 
 namespace Akka.Cluster.Tools.PublishSubscribe
 {
-    public static class Distributed
+    [Serializable]
+    public sealed class Put : IEquatable<Put>
     {
-        #region Messages
+        public readonly IActorRef Ref;
 
-        [Serializable]
-        public sealed class Put : IEquatable<Put>
+        public Put(IActorRef @ref)
         {
-            public readonly IActorRef Ref;
-
-            public Put(IActorRef @ref)
-            {
-                Ref = @ref;
-            }
-
-            public bool Equals(Put other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Ref, other.Ref);
-            }
+            Ref = @ref;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Put);
-            }
+        public bool Equals(Put other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Ref, other.Ref);
+        }
 
-            public override int GetHashCode()
-            {
-                return (Ref != null ? Ref.GetHashCode() : 0);
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Put);
+        }
 
-            public override string ToString()
-            {
-                return string.Format("Put<ref:{0}>", Ref);
-            }
+        public override int GetHashCode()
+        {
+            return (Ref != null ? Ref.GetHashCode() : 0);
         }
 
-        [Serializable]
-        public sealed class Remove : IEquatable<Remove>
+        public override string ToString()
         {
-            public readonly string Path;
+            return string.Format("Put<ref:{0}>", Ref);
+        }
+    }
 
-            public Remove(string path)
-            {
-                Path = path;
-            }
+    [Serializable]
+    public sealed class Remove : IEquatable<Remove>
+    {
+        public readonly string Path;
 
-            public bool Equals(Remove other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Path, other.Path);
-            }
+        public Remove(string path)
+        {
+            Path = path;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Remove);
-            }
+        public bool Equals(Remove other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Path, other.Path);
+        }
 
-            public override int GetHashCode()
-            {
-                return (Path != null ? Path.GetHashCode() : 0);
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Remove);
+        }
 
-            public override string ToString()
-            {
-                return string.Format("Remove<path:{0}>", Path);
-            }
+        public override int GetHashCode()
+        {
+            return (Path != null ? Path.GetHashCode() : 0);
         }
 
-        [Serializable]
-        public sealed class Subscribe : IEquatable<Subscribe>
+        public override string ToString()
         {
-            public readonly string Topic;
-            public readonly string Group;
-            public readonly IActorRef Ref;
+            return string.Format("Remove<path:{0}>", Path);
+        }
+    }
 
-            public Subscribe(string topic, IActorRef @ref, string @group = null)
-            {
-                if (string.IsNullOrEmpty(topic)) throw new ArgumentException("topic must be defined");
+    [Serializable]
+    public sealed class Subscribe : IEquatable<Subscribe>
+    {
+        public readonly string Topic;
+        public readonly string Group;
+        public readonly IActorRef Ref;
 
-                Topic = topic;
-                Group = @group;
-                Ref = @ref;
-            }
+        public Subscribe(string topic, IActorRef @ref, string @group = null)
+        {
+            if (string.IsNullOrEmpty(topic)) throw new ArgumentException("topic must be defined");
 
-            public bool Equals(Subscribe other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Topic, other.Topic) &&
-                       Equals(Group, other.Group) &&
-                       Equals(Ref, other.Ref);
-            }
+            Topic = topic;
+            Group = @group;
+            Ref = @ref;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Subscribe);
-            }
+        public bool Equals(Subscribe other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Topic, other.Topic) &&
+                   Equals(Group, other.Group) &&
+                   Equals(Ref, other.Ref);
+        }
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Group != null ? Group.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Ref != null ? Ref.GetHashCode() : 0);
-                    return hashCode;
-                }
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Subscribe);
+        }
 
-            public override string ToString()
+        public override int GetHashCode()
+        {
+            unchecked
             {
-                return string.Format("Subscribe<topic:{0}, group:{1}, ref:{2}>", Topic, Group, Ref);
+                var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Group != null ? Group.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Ref != null ? Ref.GetHashCode() : 0);
+                return hashCode;
             }
         }
 
-        [Serializable]
-        public sealed class Unsubscribe : IEquatable<Unsubscribe>
+        public override string ToString()
         {
-            public readonly string Topic;
-            public readonly string Group;
-            public readonly IActorRef Ref;
+            return string.Format("Subscribe<topic:{0}, group:{1}, ref:{2}>", Topic, Group, Ref);
+        }
+    }
 
-            public Unsubscribe(string topic, IActorRef @ref, string @group = null)
-            {
-                if (string.IsNullOrEmpty(topic)) throw new ArgumentException("topic must be defined");
+    [Serializable]
+    public sealed class Unsubscribe : IEquatable<Unsubscribe>
+    {
+        public readonly string Topic;
+        public readonly string Group;
+        public readonly IActorRef Ref;
 
-                Topic = topic;
-                Group = @group;
-                Ref = @ref;
-            }
+        public Unsubscribe(string topic, IActorRef @ref, string @group = null)
+        {
+            if (string.IsNullOrEmpty(topic)) throw new ArgumentException("topic must be defined");
 
-            public bool Equals(Unsubscribe other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Topic, other.Topic) &&
-                       Equals(Group, other.Group) &&
-                       Equals(Ref, other.Ref);
-            }
+            Topic = topic;
+            Group = @group;
+            Ref = @ref;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Unsubscribe);
-            }
+        public bool Equals(Unsubscribe other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Topic, other.Topic) &&
+                   Equals(Group, other.Group) &&
+                   Equals(Ref, other.Ref);
+        }
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Group != null ? Group.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Ref != null ? Ref.GetHashCode() : 0);
-                    return hashCode;
-                }
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Unsubscribe);
+        }
 
-            public override string ToString()
+        public override int GetHashCode()
+        {
+            unchecked
             {
-                return string.Format("Unsubscribe<topic:{0}, group:{1}, ref:{2}>", Topic, Group, Ref);
+                var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Group != null ? Group.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Ref != null ? Ref.GetHashCode() : 0);
+                return hashCode;
             }
         }
 
-        [Serializable]
-        public sealed class SubscribeAck : IEquatable<SubscribeAck>
+        public override string ToString()
         {
-            public readonly Subscribe Subscribe;
+            return string.Format("Unsubscribe<topic:{0}, group:{1}, ref:{2}>", Topic, Group, Ref);
+        }
+    }
 
-            public SubscribeAck(Subscribe subscribe)
-            {
-                Subscribe = subscribe;
-            }
+    [Serializable]
+    public sealed class SubscribeAck : IEquatable<SubscribeAck>
+    {
+        public readonly Subscribe Subscribe;
 
-            public bool Equals(SubscribeAck other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Subscribe, other.Subscribe);
-            }
+        public SubscribeAck(Subscribe subscribe)
+        {
+            Subscribe = subscribe;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as SubscribeAck);
-            }
+        public bool Equals(SubscribeAck other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Subscribe, other.Subscribe);
+        }
 
-            public override int GetHashCode()
-            {
-                return (Subscribe != null ? Subscribe.GetHashCode() : 0);
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SubscribeAck);
+        }
 
-            public override string ToString()
-            {
-                return string.Format("SubscribeAck<{0}>", Subscribe);
-            }
+        public override int GetHashCode()
+        {
+            return (Subscribe != null ? Subscribe.GetHashCode() : 0);
         }
 
-        [Serializable]
-        public sealed class UnsubscribeAck : IEquatable<UnsubscribeAck>
+        public override string ToString()
         {
-            public readonly Unsubscribe Unsubscribe;
+            return string.Format("SubscribeAck<{0}>", Subscribe);
+        }
+    }
 
-            public UnsubscribeAck(Unsubscribe unsubscribe)
-            {
-                Unsubscribe = unsubscribe;
-            }
+    [Serializable]
+    public sealed class UnsubscribeAck : IEquatable<UnsubscribeAck>
+    {
+        public readonly Unsubscribe Unsubscribe;
 
-            public bool Equals(UnsubscribeAck other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Unsubscribe, other.Unsubscribe);
-            }
+        public UnsubscribeAck(Unsubscribe unsubscribe)
+        {
+            Unsubscribe = unsubscribe;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as UnsubscribeAck);
-            }
+        public bool Equals(UnsubscribeAck other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Unsubscribe, other.Unsubscribe);
+        }
 
-            public override int GetHashCode()
-            {
-                return (Unsubscribe != null ? Unsubscribe.GetHashCode() : 0);
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as UnsubscribeAck);
+        }
 
-            public override string ToString()
-            {
-                return string.Format("UnsubscribeAck<{0}>", Unsubscribe);
-            }
+        public override int GetHashCode()
+        {
+            return (Unsubscribe != null ? Unsubscribe.GetHashCode() : 0);
         }
 
-        [Serializable]
-        public sealed class Publish : IDistributedPubSubMessage, IEquatable<Publish>
+        public override string ToString()
         {
-            public readonly string Topic;
-            public readonly object Message;
-            public readonly bool SendOneMessageToEachGroup;
+            return string.Format("UnsubscribeAck<{0}>", Unsubscribe);
+        }
+    }
 
-            public Publish(string topic, object message, bool sendOneMessageToEachGroup = false)
-            {
-                Topic = topic;
-                Message = message;
-                SendOneMessageToEachGroup = sendOneMessageToEachGroup;
-            }
+    [Serializable]
+    public sealed class Publish : IDistributedPubSubMessage, IEquatable<Publish>
+    {
+        public readonly string Topic;
+        public readonly object Message;
+        public readonly bool SendOneMessageToEachGroup;
 
-            public bool Equals(Publish other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Topic, other.Topic) &&
-                       Equals(SendOneMessageToEachGroup, other.SendOneMessageToEachGroup) &&
-                       Equals(Message, other.Message);
-            }
+        public Publish(string topic, object message, bool sendOneMessageToEachGroup = false)
+        {
+            Topic = topic;
+            Message = message;
+            SendOneMessageToEachGroup = sendOneMessageToEachGroup;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Publish);
-            }
+        public bool Equals(Publish other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Topic, other.Topic) &&
+                   Equals(SendOneMessageToEachGroup, other.SendOneMessageToEachGroup) &&
+                   Equals(Message, other.Message);
+        }
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ SendOneMessageToEachGroup.GetHashCode();
-                    return hashCode;
-                }
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Publish);
+        }
 
-            public override string ToString()
+        public override int GetHashCode()
+        {
+            unchecked
             {
-                return string.Format("Publish<topic:{0}, sendOneToEachGroup:{1}, message:{2}>", Topic, SendOneMessageToEachGroup, Message);
+                var hashCode = (Topic != null ? Topic.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ SendOneMessageToEachGroup.GetHashCode();
+                return hashCode;
             }
         }
 
-        [Serializable]
-        public sealed class Send : IDistributedPubSubMessage, IEquatable<Send>
+        public override string ToString()
         {
-            public readonly string Path;
-            public readonly object Message;
-            public readonly bool LocalAffinity;
+            return string.Format("Publish<topic:{0}, sendOneToEachGroup:{1}, message:{2}>", Topic, SendOneMessageToEachGroup, Message);
+        }
+    }
 
-            public Send(string path, object message, bool localAffinity = false)
-            {
-                Path = path;
-                Message = message;
-                LocalAffinity = localAffinity;
-            }
+    [Serializable]
+    public sealed class Send : IDistributedPubSubMessage, IEquatable<Send>
+    {
+        public readonly string Path;
+        public readonly object Message;
+        public readonly bool LocalAffinity;
 
-            public bool Equals(Send other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(Path, other.Path) &&
-                       Equals(LocalAffinity, other.LocalAffinity) &&
-                       Equals(Message, other.Message);
-            }
+        public Send(string path, object message, bool localAffinity = false)
+        {
+            Path = path;
+            Message = message;
+            LocalAffinity = localAffinity;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as Send);
-            }
+        public bool Equals(Send other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(Path, other.Path) &&
+                   Equals(LocalAffinity, other.LocalAffinity) &&
+                   Equals(Message, other.Message);
+        }
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Path != null ? Path.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ LocalAffinity.GetHashCode();
-                    return hashCode;
-                }
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Send);
+        }
 
-            public override string ToString()
+        public override int GetHashCode()
+        {
+            unchecked
             {
-                return string.Format("Send<path:{0}, localAffinity:{1}, message:{2}>", Path, LocalAffinity, Message);
+                var hashCode = (Path != null ? Path.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ LocalAffinity.GetHashCode();
+                return hashCode;
             }
         }
 
-        [Serializable]
-        public sealed class SendToAll : IDistributedPubSubMessage, IEquatable<SendToAll>
+        public override string ToString()
         {
-            public readonly string Path;
-            public readonly object Message;
-            public readonly bool ExcludeSelf;
+            return string.Format("Send<path:{0}, localAffinity:{1}, message:{2}>", Path, LocalAffinity, Message);
+        }
+    }
 
-            public SendToAll(string path, object message, bool excludeSelf = false)
-            {
-                Path = path;
-                Message = message;
-                ExcludeSelf = excludeSelf;
-            }
+    [Serializable]
+    public sealed class SendToAll : IDistributedPubSubMessage, IEquatable<SendToAll>
+    {
+        public readonly string Path;
+        public readonly object Message;
+        public readonly bool ExcludeSelf;
 
-            public bool Equals(SendToAll other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
-                return Equals(ExcludeSelf, other.ExcludeSelf) &&
-                       Equals(Path, other.Path) &&
-                       Equals(Message, other.Message);
-            }
+        public SendToAll(string path, object message, bool excludeSelf = false)
+        {
+            Path = path;
+            Message = message;
+            ExcludeSelf = excludeSelf;
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as SendToAll);
-            }
+        public bool Equals(SendToAll other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            return Equals(ExcludeSelf, other.ExcludeSelf) &&
+                   Equals(Path, other.Path) &&
+                   Equals(Message, other.Message);
+        }
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Path != null ? Path.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ ExcludeSelf.GetHashCode();
-                    return hashCode;
-                }
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SendToAll);
+        }
 
-            public override string ToString()
+        public override int GetHashCode()
+        {
+            unchecked
             {
-                return string.Format("SendToAll<path:{0}, excludeSelf:{1}, message:{2}>", Path, ExcludeSelf, Message);
+                var hashCode = (Path != null ? Path.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ ExcludeSelf.GetHashCode();
+                return hashCode;
             }
         }
 
-        [Serializable]
-        public sealed class GetTopics : IEquatable<GetTopics>
+        public override string ToString()
         {
-            public static readonly GetTopics Instance = new GetTopics();
-            private GetTopics() { }
-
-            public bool Equals(GetTopics other)
-            {
-                if (other == null) return false;
-                return true;
-            }
+            return string.Format("SendToAll<path:{0}, excludeSelf:{1}, message:{2}>", Path, ExcludeSelf, Message);
+        }
+    }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as GetTopics);
-            }
+    [Serializable]
+    public sealed class GetTopics : IEquatable<GetTopics>
+    {
+        public static readonly GetTopics Instance = new GetTopics();
+        private GetTopics() { }
 
-            public override string ToString()
-            {
-                return "GetTopics<>";
-            }
+        public bool Equals(GetTopics other)
+        {
+            if (other == null) return false;
+            return true;
         }
 
-        [Serializable]
-        public sealed class CurrentTopics : IEquatable<CurrentTopics>
+        public override bool Equals(object obj)
         {
-            public readonly string[] Topics;
+            return Equals(obj as GetTopics);
+        }
 
-            public CurrentTopics(string[] topics)
-            {
-                Topics = topics ?? new string[0];
-            }
+        public override string ToString()
+        {
+            return "GetTopics<>";
+        }
+    }
 
-            public bool Equals(CurrentTopics other)
-            {
-                if (ReferenceEquals(other, null)) return false;
-                if (ReferenceEquals(other, this)) return true;
+    [Serializable]
+    public sealed class CurrentTopics : IEquatable<CurrentTopics>
+    {
+        public readonly string[] Topics;
 
-                return Equals(Topics, other.Topics);
-            }
+        public CurrentTopics(string[] topics)
+        {
+            Topics = topics ?? new string[0];
+        }
 
-            public override bool Equals(object obj)
-            {
-                return Equals(obj as CurrentTopics);
-            }
+        public bool Equals(CurrentTopics other)
+        {
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
 
-            public override int GetHashCode()
-            {
-                return (Topics != null ? Topics.GetHashCode() : 0);
-            }
+            return Equals(Topics, other.Topics);
+        }
 
-            public override string ToString()
-            {
-                return string.Format("CurrentTopics<{0}>", string.Join(",", Topics));
-            }
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as CurrentTopics);
         }
 
-        #endregion
+        public override int GetHashCode()
+        {
+            return (Topics != null ? Topics.GetHashCode() : 0);
+        }
 
+        public override string ToString()
+        {
+            return string.Format("CurrentTopics<{0}>", string.Join(",", Topics));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs
index cabc2647e25..67e7546c80e 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs
@@ -43,7 +43,7 @@ namespace Akka.Cluster.Tools.PublishSubscribe
     /// any other node. There is three modes of message delivery.
     /// </para>
     /// <para>
-    /// 1. <see cref="Distributed.Send"/> -
+    /// 1. <see cref="Send"/> -
     /// The message will be delivered to one recipient with a matching path, if any such
     /// exists in the registry. If several entries match the path the message will be sent
     /// via the supplied `routingLogic` (default random) to one destination. The sender of the
@@ -55,7 +55,7 @@ namespace Akka.Cluster.Tools.PublishSubscribe
     /// can register themselves.
     /// </para>
     /// <para>
-    /// 2. <see cref="Distributed.SendToAll"/> -
+    /// 2. <see cref="SendToAll"/> -
     /// The message will be delivered to all recipients with a matching path. Actors with
     /// the same path, without address information, can be registered on different nodes.
     /// On each node there can only be one such actor, since the path is unique within one
@@ -64,7 +64,7 @@ namespace Akka.Cluster.Tools.PublishSubscribe
     /// for redundancy.
     /// </para>
     /// <para>
-    /// 3. <see cref="Distributed.Publish"/> -
+    /// 3. <see cref="Publish"/> -
     /// Actors may be registered to a named topic instead of path. This enables many subscribers
     /// on each node. The message will be delivered to all subscribers of the topic. For
     /// efficiency the message is sent over the wire only once per node (that has a matching topic),
@@ -73,28 +73,28 @@ namespace Akka.Cluster.Tools.PublishSubscribe
     /// application.
     /// </para>
     /// <para>
-    /// 4. <see cref="Distributed.Publish"/> with sendOneMessageToEachGroup -
+    /// 4. <see cref="Publish"/> with sendOneMessageToEachGroup -
     /// Actors may be subscribed to a named topic with an optional property `group`.
     /// If subscribing with a group name, each message published to a topic with the
     /// `sendOneMessageToEachGroup` flag is delivered via the supplied `routingLogic`
     /// (default random) to one actor within each subscribing group.
     /// If all the subscribed actors have the same group name, then this works just like
-    /// <see cref="Distributed.Send"/> and all messages are delivered to one subscribe.
+    /// <see cref="Send"/> and all messages are delivered to one subscribe.
     /// If all the subscribed actors have different group names, then this works like normal
-    /// <see cref="Distributed.Publish"/> and all messages are broadcast to all subscribers.
+    /// <see cref="Publish"/> and all messages are broadcast to all subscribers.
     /// </para>
     /// <para>
-    /// You register actors to the local mediator with <see cref="Distributed.Put"/> or
-    /// <see cref="Distributed.Subscribe"/>. `Put` is used together with `Send` and
+    /// You register actors to the local mediator with <see cref="Put"/> or
+    /// <see cref="Subscribe"/>. `Put` is used together with `Send` and
     /// `SendToAll` message delivery modes. The `ActorRef` in `Put` must belong to the same
     /// local actor system as the mediator. `Subscribe` is used together with `Publish`.
     /// Actors are automatically removed from the registry when they are terminated, or you
-    /// can explicitly remove entries with <see cref="Distributed.Remove"/> or
-    /// <see cref="Distributed.Unsubscribe"/>.
+    /// can explicitly remove entries with <see cref="Remove"/> or
+    /// <see cref="Unsubscribe"/>.
     /// </para>
     /// <para>
     /// Successful `Subscribe` and `Unsubscribe` is acknowledged with
-    /// <see cref="Distributed.SubscribeAck"/> and <see cref="Distributed.UnsubscribeAck"/>
+    /// <see cref="SubscribeAck"/> and <see cref="UnsubscribeAck"/>
     /// replies.
     /// </para>
     /// </summary>
@@ -142,7 +142,7 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
             _pruneInterval = new TimeSpan(_settings.RemovedTimeToLive.Ticks / 2);
             _pruneCancelable = Context.System.Scheduler.ScheduleTellRepeatedlyCancelable(_pruneInterval, _pruneInterval, Self, Prune.Instance, Self);
 
-            Receive<Distributed.Send>(send =>
+            Receive<Send>(send =>
             {
                 var routees = new List<Routee>();
 
@@ -173,11 +173,11 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
                     new Router(_settings.RoutingLogic, routees.ToArray()).Route(Utils.WrapIfNeeded(send.Message), Sender);
                 }
             });
-            Receive<Distributed.SendToAll>(sendToAll =>
+            Receive<SendToAll>(sendToAll =>
             {
                 PublishMessage(sendToAll.Path, sendToAll.Message, sendToAll.ExcludeSelf);
             });
-            Receive<Distributed.Publish>(publish =>
+            Receive<Publish>(publish =>
             {
                 var topic = Uri.EscapeDataString(publish.Topic);
                 var path = Self.Path / topic;
@@ -186,7 +186,7 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
                 else
                     PublishMessage(path.ToStringWithoutAddress(), publish.Message);
             });
-            Receive<Distributed.Put>(put =>
+            Receive<Put>(put =>
             {
                 if (!string.IsNullOrEmpty(put.Ref.Path.Address.Host))
                     Log.Warning("Registered actor must be local: [{0}]", put.Ref);
@@ -196,7 +196,7 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
                     Context.Watch(put.Ref);
                 }
             });
-            Receive<Distributed.Remove>(remove =>
+            Receive<Remove>(remove =>
             {
                 Bucket bucket;
                 if (_registry.TryGetValue(_cluster.SelfAddress, out bucket))
@@ -209,7 +209,7 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
                     }
                 }
             });
-            Receive<Distributed.Subscribe>(subscribe =>
+            Receive<Subscribe>(subscribe =>
             {
                 // each topic is managed by a child actor with the same name as the topic
                 var topic = Uri.EscapeDataString(subscribe.Topic);
@@ -230,15 +230,15 @@ public DistributedPubSubMediator(DistributedPubSubSettings settings)
             {
                 HandleRegisterTopic(register.TopicRef);
             });
-            Receive<Distributed.GetTopics>(getTopics =>
+            Receive<GetTopics>(getTopics =>
             {
-                Sender.Tell(new Distributed.CurrentTopics(GetCurrentTopics().ToArray()));
+                Sender.Tell(new CurrentTopics(GetCurrentTopics().ToArray()));
             });
             Receive<Subscribed>(subscribed =>
             {
                 subscribed.Subscriber.Tell(subscribed.Ack);
             });
-            Receive<Distributed.Unsubscribe>(unsubscribe =>
+            Receive<Unsubscribe>(unsubscribe =>
             {
                 var topic = Uri.EscapeDataString(unsubscribe.Topic);
                 var child = Context.Child(topic);
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs
index 84bef4f2f53..aa5644f3091 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs
@@ -14,21 +14,21 @@
 namespace Akka.Cluster.Tools.PublishSubscribe.Internal
 {
     [Serializable]
-    public sealed class Prune
+    internal sealed class Prune
     {
         public static readonly Prune Instance = new Prune();
         private Prune() { }
     }
 
     // Only for testing purposes, to poll/await replication
-    public sealed class Count
+    internal sealed class Count
     {
         public static readonly Count Instance = new Count();
         private Count() { }
     }
 
     [Serializable]
-    public struct Bucket
+    internal struct Bucket
     {
         public readonly Address Owner;
         public readonly long Version;
@@ -47,7 +47,7 @@ public Bucket(Address owner, long version, IImmutableDictionary<string, ValueHol
     }
 
     [Serializable]
-    public sealed class ValueHolder
+    internal sealed class ValueHolder
     {
         public readonly long Version;
         public readonly IActorRef Ref;
@@ -65,7 +65,7 @@ public ValueHolder(long version, IActorRef @ref)
     }
 
     [Serializable]
-    public sealed class Status : IDistributedPubSubMessage
+    internal sealed class Status : IDistributedPubSubMessage
     {
         public readonly IDictionary<Address, long> Versions;
 
@@ -76,7 +76,7 @@ public Status(IDictionary<Address, long> versions)
     }
 
     [Serializable]
-    public sealed class Delta : IDistributedPubSubMessage
+    internal sealed class Delta : IDistributedPubSubMessage
     {
         public readonly Bucket[] Buckets;
 
@@ -87,7 +87,7 @@ public Delta(Bucket[] buckets)
     }
 
     [Serializable]
-    public sealed class GossipTick
+    internal sealed class GossipTick
     {
         public static readonly GossipTick Instance = new GossipTick();
 
@@ -95,7 +95,7 @@ private GossipTick() { }
     }
 
     [Serializable]
-    public sealed class RegisterTopic
+    internal sealed class RegisterTopic
     {
         public readonly IActorRef TopicRef;
 
@@ -106,12 +106,12 @@ public RegisterTopic(IActorRef topicRef)
     }
 
     [Serializable]
-    public sealed class Subscribed
+    internal sealed class Subscribed
     {
-        public readonly Distributed.SubscribeAck Ack;
+        public readonly SubscribeAck Ack;
         public readonly IActorRef Subscriber;
 
-        public Subscribed(Distributed.SubscribeAck ack, IActorRef subscriber)
+        public Subscribed(SubscribeAck ack, IActorRef subscriber)
         {
             Ack = ack;
             Subscriber = subscriber;
@@ -119,12 +119,12 @@ public Subscribed(Distributed.SubscribeAck ack, IActorRef subscriber)
     }
 
     [Serializable]
-    public sealed class Unsubscribed
+    internal sealed class Unsubscribed
     {
-        public readonly Distributed.UnsubscribeAck Ack;
+        public readonly UnsubscribeAck Ack;
         public readonly IActorRef Subscriber;
 
-        public Unsubscribed(Distributed.UnsubscribeAck ack, IActorRef subscriber)
+        public Unsubscribed(UnsubscribeAck ack, IActorRef subscriber)
         {
             Ack = ack;
             Subscriber = subscriber;
@@ -132,7 +132,7 @@ public Unsubscribed(Distributed.UnsubscribeAck ack, IActorRef subscriber)
     }
 
     [Serializable]
-    public sealed class SendToOneSubscriber
+    internal sealed class SendToOneSubscriber
     {
         public readonly object Message;
 
@@ -143,7 +143,7 @@ public SendToOneSubscriber(object message)
     }
 
     [Serializable]
-    public sealed class MediatorRouterEnvelope : RouterEnvelope
+    internal sealed class MediatorRouterEnvelope : RouterEnvelope
     {
         public MediatorRouterEnvelope(object message) : base(message) { }
     }
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/Topics.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/Topics.cs
index 3af46f25646..efca84eb845 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/Topics.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/Topics.cs
@@ -14,7 +14,7 @@
 
 namespace Akka.Cluster.Tools.PublishSubscribe.Internal
 {
-    public abstract class TopicLike : ActorBase
+    internal abstract class TopicLike : ActorBase
     {
         protected readonly TimeSpan PruneInterval;
         protected readonly ICancelable PruneCancelable;
@@ -39,22 +39,22 @@ protected override void PostStop()
 
         protected bool DefaultReceive(object message)
         {
-            if (message is Distributed.Subscribe)
+            if (message is Subscribe)
             {
-                var subscribe = (Distributed.Subscribe)message;
+                var subscribe = (Subscribe)message;
 
                 Context.Watch(subscribe.Ref);
                 Subscribers.Add(subscribe.Ref);
                 PruneDeadline = null;
-                Context.Parent.Tell(new Subscribed(new Distributed.SubscribeAck(subscribe), Sender));
+                Context.Parent.Tell(new Subscribed(new SubscribeAck(subscribe), Sender));
             }
-            else if (message is Distributed.Unsubscribe)
+            else if (message is Unsubscribe)
             {
-                var unsubscribe = (Distributed.Unsubscribe)message;
+                var unsubscribe = (Unsubscribe)message;
 
                 Context.Unwatch(unsubscribe.Ref);
                 Remove(unsubscribe.Ref);
-                Context.Parent.Tell(new Unsubscribed(new Distributed.UnsubscribeAck(unsubscribe), Sender));
+                Context.Parent.Tell(new Unsubscribed(new UnsubscribeAck(unsubscribe), Sender));
             }
             else if (message is Terminated)
             {
@@ -92,7 +92,7 @@ private void Remove(IActorRef actorRef)
         }
     }
 
-    public class Topic : TopicLike
+    internal class Topic : TopicLike
     {
         private readonly RoutingLogic _routingLogic;
 
@@ -103,9 +103,9 @@ public Topic(TimeSpan emptyTimeToLive, RoutingLogic routingLogic) : base(emptyTi
 
         protected override bool Business(object message)
         {
-            Distributed.Subscribe subscribe;
-            Distributed.Unsubscribe unsubscribe;
-            if ((subscribe = message as Distributed.Subscribe) != null && subscribe.Group != null)
+            Subscribe subscribe;
+            Unsubscribe unsubscribe;
+            if ((subscribe = message as Subscribe) != null && subscribe.Group != null)
             {
                 var encodedGroup = Encode(subscribe.Group);
                 var child = encodedGroup == null ? ActorRefs.Nobody : Context.Child(encodedGroup);
@@ -124,7 +124,7 @@ protected override bool Business(object message)
 
                 PruneDeadline = null;
             }
-            else if ((unsubscribe = message as Distributed.Unsubscribe) != null && unsubscribe.Group != null)
+            else if ((unsubscribe = message as Unsubscribe) != null && unsubscribe.Group != null)
             {
                 var encodedGroup = Encode(unsubscribe.Group);
                 var child = encodedGroup == null ? ActorRefs.Nobody : Context.Child(encodedGroup);
@@ -152,7 +152,7 @@ private static string Encode(string name)
         }
     }
 
-    public class Group : TopicLike
+    internal class Group : TopicLike
     {
         private readonly RoutingLogic _routingLogic;
 
@@ -177,7 +177,7 @@ protected override bool Business(object message)
         }
     }
 
-    public static class Utils
+    internal static class Utils
     {
         /// <summary>
         /// <para>
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/DistributedPubSubMessageSerializer.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/DistributedPubSubMessageSerializer.cs
index 72d251039d9..1b616b45d77 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/DistributedPubSubMessageSerializer.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Serialization/DistributedPubSubMessageSerializer.cs
@@ -58,9 +58,9 @@ public override byte[] ToBinary(object obj)
         {
             if (obj is Internal.Status) return Compress(StatusToProto(obj as Internal.Status));
             else if (obj is Internal.Delta) return Compress(DeltaToProto(obj as Internal.Delta));
-            else if (obj is Distributed.Send) return SendToProto(obj as Distributed.Send).ToByteArray();
-            else if (obj is Distributed.SendToAll) return SendToAllToProto(obj as Distributed.SendToAll).ToByteArray();
-            else if (obj is Distributed.Publish) return PublishToProto(obj as Distributed.Publish).ToByteArray();
+            else if (obj is Send) return SendToProto(obj as Send).ToByteArray();
+            else if (obj is SendToAll) return SendToAllToProto(obj as SendToAll).ToByteArray();
+            else if (obj is Publish) return PublishToProto(obj as Publish).ToByteArray();
             else throw new ArgumentException(string.Format("Can't serialize object of type {0} with {1}", obj.GetType(), GetType()));
         }
 
@@ -79,9 +79,9 @@ public override string Manifest(object o)
         {
             if (o is Internal.Status) return StatusManifest;
             if (o is Internal.Delta) return DeltaManifest;
-            if (o is Distributed.Send) return SendManifest;
-            if (o is Distributed.SendToAll) return SendToAllManifest;
-            if (o is Distributed.Publish) return PublishManifest;
+            if (o is Send) return SendManifest;
+            if (o is SendToAll) return SendToAllManifest;
+            if (o is Publish) return PublishManifest;
 
             throw new ArgumentException(string.Format("Serializer {0} cannot serialize message of type {1}", this.GetType(), o.GetType()));
         }
@@ -197,60 +197,60 @@ private Internal.Status StatusFromProto(Status status)
                     v => v.Timestamp));
         }
 
-        private Send SendToProto(Distributed.Send send)
+        private Akka.Cluster.PubSub.Serializers.Proto.Send SendToProto(Send send)
         {
-            return Send.CreateBuilder()
+            return Akka.Cluster.PubSub.Serializers.Proto.Send.CreateBuilder()
                 .SetPath(send.Path)
                 .SetLocalAffinity(send.LocalAffinity)
                 .SetPayload(PayloadToProto(send.Message))
                 .Build();
         }
 
-        private Distributed.Send SendFromBinary(byte[] binary)
+        private Send SendFromBinary(byte[] binary)
         {
-            return SendFromProto(Send.ParseFrom(binary));
+            return SendFromProto(Akka.Cluster.PubSub.Serializers.Proto.Send.ParseFrom(binary));
         }
 
-        private Distributed.Send SendFromProto(Send send)
+        private Send SendFromProto(Akka.Cluster.PubSub.Serializers.Proto.Send send)
         {
-            return new Distributed.Send(send.Path, PayloadFromProto(send.Payload), send.LocalAffinity);
+            return new Send(send.Path, PayloadFromProto(send.Payload), send.LocalAffinity);
         }
 
-        private SendToAll SendToAllToProto(Distributed.SendToAll sendToAll)
+        private Akka.Cluster.PubSub.Serializers.Proto.SendToAll SendToAllToProto(SendToAll sendToAll)
         {
-            return SendToAll.CreateBuilder()
+            return Akka.Cluster.PubSub.Serializers.Proto.SendToAll.CreateBuilder()
                 .SetPath(sendToAll.Path)
                 .SetAllButSelf(sendToAll.ExcludeSelf)
                 .SetPayload(PayloadToProto(sendToAll.Message))
                 .Build();
         }
 
-        private Distributed.SendToAll SendToAllFromBinary(byte[] binary)
+        private SendToAll SendToAllFromBinary(byte[] binary)
         {
-            return SendToAllFromProto(SendToAll.ParseFrom(binary));
+            return SendToAllFromProto(Akka.Cluster.PubSub.Serializers.Proto.SendToAll.ParseFrom(binary));
         }
 
-        private Distributed.SendToAll SendToAllFromProto(SendToAll send)
+        private SendToAll SendToAllFromProto(Akka.Cluster.PubSub.Serializers.Proto.SendToAll send)
         {
-            return new Distributed.SendToAll(send.Path, PayloadFromProto(send.Payload), send.AllButSelf);
+            return new SendToAll(send.Path, PayloadFromProto(send.Payload), send.AllButSelf);
         }
 
-        private Publish PublishToProto(Distributed.Publish publish)
+        private Akka.Cluster.PubSub.Serializers.Proto.Publish PublishToProto(Publish publish)
         {
-            return Publish.CreateBuilder()
+            return Akka.Cluster.PubSub.Serializers.Proto.Publish.CreateBuilder()
                 .SetTopic(publish.Topic)
                 .SetPayload(PayloadToProto(publish.Message))
                 .Build();
         }
 
-        private Distributed.Publish PublishFromBinary(byte[] binary)
+        private Publish PublishFromBinary(byte[] binary)
         {
-            return PublishFromProto(Publish.ParseFrom(binary));
+            return PublishFromProto(Akka.Cluster.PubSub.Serializers.Proto.Publish.ParseFrom(binary));
         }
 
-        private Distributed.Publish PublishFromProto(Publish publish)
+        private Publish PublishFromProto(Akka.Cluster.PubSub.Serializers.Proto.Publish publish)
         {
-            return new Distributed.Publish(publish.Topic, PayloadFromProto(publish.Payload));
+            return new Publish(publish.Topic, PayloadFromProto(publish.Payload));
         }
 
         private Payload PayloadToProto(object message)
diff --git a/src/core/protobuf/ClusterShardingMessages.proto b/src/core/protobuf/ClusterShardingMessages.proto
new file mode 100644
index 00000000000..9820e971fbb
--- /dev/null
+++ b/src/core/protobuf/ClusterShardingMessages.proto
@@ -0,0 +1,54 @@
+/**
+ * Copyright (C) 2015 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+option java_package = "akka.cluster.sharding.protobuf.msg";
+option optimize_for = SPEED;
+
+message CoordinatorState {
+
+  message ShardEntry {
+    required string shardId = 1;
+    required string regionRef = 2;
+  }
+  
+  repeated ShardEntry shards = 1;
+  repeated string regions = 2;
+  repeated string regionProxies = 3;
+  repeated string unallocatedShards = 4; 
+}
+
+message ActorRefMessage {
+  required string ref = 1;
+}
+
+message ShardIdMessage {
+  required string shard = 1;
+}
+
+message ShardHomeAllocated {
+  required string shard = 1;
+  required string region = 2;
+}
+
+message ShardHome {
+  required string shard = 1;
+  required string region = 2;
+}
+
+message EntityState {
+  repeated string entities = 1;
+}
+
+message EntityStarted {
+  required string entityId = 1;
+}
+
+message EntityStopped {
+  required string entityId = 1;
+}
+
+message ShardStats {
+    required string shard = 1;
+    required int32 entityCount = 2;
+}
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/App.config b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/App.config
index 1cec105421e..64c997c30a7 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/App.config
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/App.config
@@ -23,6 +23,9 @@
             port = 0
           }
         }
+        cluster {
+          auto-down-unreachable-after = 5s
+        }
         persistence {
           journal {
             plugin = "akka.persistence.journal.sqlite"
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj
index 21caa5aa6e7..b25abd187a3 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj
@@ -74,6 +74,7 @@
   <ItemGroup>
     <Compile Include="AutomaticJoin\AutomaticCluster.cs" />
     <Compile Include="AutomaticJoin\DBHelper.cs" />
+    <Compile Include="MessageExtractor.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Printer.cs" />
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs
new file mode 100644
index 00000000000..20f0c6c033b
--- /dev/null
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/MessageExtractor.cs
@@ -0,0 +1,25 @@
+using Akka.Cluster.Sharding;
+
+namespace ClusterSharding.Node
+{
+    public sealed class MessageExtractor : IMessageExtractor
+    {
+        public string EntityId(object message)
+        {
+            var env = message as Printer.Env;
+            return env != null ? env.EntityId.ToString() : null;
+        }
+
+        public object EntityMessage(object message)
+        {
+            var env = message as Printer.Env;
+            return env != null ? env.Message : null;
+        }
+
+        public string ShardId(object message)
+        {
+            var env = message as Printer.Env;
+            return env != null ? env.ShardId.ToString() : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
index 63b0ba62a51..8126d08e282 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Printer.cs
@@ -6,31 +6,6 @@ namespace ClusterSharding.Node
 {
     public class Printer : ReceiveActor
     {
-        #region Message extractor
-
-        public sealed class MessageExtractor : IMessageExtractor
-        {
-            public string EntityId(object message)
-            {
-                var env = message as Env;
-                return env != null ? env.EntityId.ToString() : null;
-            }
-
-            public object EntityMessage(object message)
-            {
-                var env = message as Env;
-                return env != null ? env.Message : null;
-            }
-
-            public string ShardId(object message)
-            {
-                var env = message as Env;
-                return env != null ? env.ShardId.ToString() : null;
-            }
-        }
-
-        #endregion
-
         #region Messages
         
         public sealed class Env
diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
index bb0c8edfc7e..86b79d39113 100644
--- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
+++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/Program.cs
@@ -41,10 +41,10 @@ private static void RunExample(ActorSystem system)
                 typeName: "printer",
                 entityProps: Props.Create<Printer>(),
                 settings: ClusterShardingSettings.Create(system),
-                messageExtractor: new Printer.MessageExtractor());
+                messageExtractor: new MessageExtractor());
 
             Thread.Sleep(5000);
-            Console.Write("Press ENTER to start...");
+            Console.Write("Press ENTER to start producing messages...");
             Console.ReadLine();
 
             ProduceMessages(system, shardRegion);
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/App.config b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/App.config
index 46d76ce27ad..ad83280b0d0 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/App.config
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Node/App.config
@@ -49,4 +49,19 @@
       ]]>
     </hocon>
   </akka>
-<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" /></runtime></configuration>
\ No newline at end of file
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" />
+  </runtime>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" >
+      <dependentAssembly>
+        <assemblyIdentity name="Google.ProtocolBuffers.Serialization" publicKeyToken="55f7125234beb589" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.1.555" newVersion="2.4.1.555" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Google.ProtocolBuffers" publicKeyToken="55f7125234beb589" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.1.555" newVersion="2.4.1.555" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/App.config b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/App.config
index 8e91874035f..c4395580179 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/App.config
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/App.config
@@ -43,4 +43,19 @@
       ]]>
     </hocon>
   </akka>
-<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" /></runtime></configuration>
\ No newline at end of file
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" />
+  </runtime>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" >
+      <dependentAssembly>
+        <assemblyIdentity name="Google.ProtocolBuffers.Serialization" publicKeyToken="55f7125234beb589" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.1.555" newVersion="2.4.1.555" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Google.ProtocolBuffers" publicKeyToken="55f7125234beb589" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.4.1.555" newVersion="2.4.1.555" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
index b3aa43b2994..2cb8ab1c7e6 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Seed/Program.cs
@@ -43,7 +43,7 @@ static void RunDistributedPubSubSeed(ActorSystem system)
             var mediator = DistributedPubSub.Get(system).Mediator;
 
             system.Scheduler.ScheduleTellRepeatedly(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5), mediator,
-                new Distributed.Publish("echo", new Echo("hello world")), ActorRefs.NoSender);
+                new Publish("echo", new Echo("hello world")), ActorRefs.NoSender);
         }
 
         /// <summary>
diff --git a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
index d081fd2209b..6c3fff9ce6e 100644
--- a/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
+++ b/src/examples/Cluster/ClusterTools/ClusterToolsExample.Shared/Echo.cs
@@ -25,19 +25,19 @@ public class EchoReceiver : ReceiveActor
         public EchoReceiver()
         {
             Receive<Echo>(echo => Console.WriteLine(echo.Message));
-            Receive<Distributed.SubscribeAck>(ack =>
+            Receive<SubscribeAck>(ack =>
                 Console.WriteLine("Actor [{0}] has subscribed to topic [{1}]", ack.Subscribe.Ref, ack.Subscribe.Topic));
         }
 
         protected override void PreStart()
         {
             base.PreStart();
-            Mediator.Tell(new Distributed.Subscribe(Topic, Self));
+            Mediator.Tell(new Subscribe(Topic, Self));
         }
 
         protected override void PostStop()
         {
-            Mediator.Tell(new Distributed.Unsubscribe(Topic, Self));
+            Mediator.Tell(new Unsubscribe(Topic, Self));
             base.PostStop();
         }
     }

From 80d2f257c7ab46fb738c8d2ea3c710813c3a06d5 Mon Sep 17 00:00:00 2001
From: Bartosz Sypytkowski <b.sypytkowski@gmail.com>
Date: Sat, 19 Dec 2015 21:56:21 +0100
Subject: [PATCH 2/2] created nuspecs for Akka.Cluster.Sharding and
 Akka.Cluster.Tools

---
 build.fsx                                     |  2 ++
 .../Akka.Cluster.Sharding.csproj              |  1 +
 .../Akka.Cluster.Sharding.nuspec              | 20 +++++++++++++++++++
 .../Akka.Cluster.Tools.csproj                 |  1 +
 .../Akka.Cluster.Tools.nuspec                 | 20 +++++++++++++++++++
 5 files changed, 44 insertions(+)
 create mode 100644 src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.nuspec
 create mode 100644 src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.nuspec

diff --git a/build.fsx b/build.fsx
index 38a19af57e0..03c0b7cb281 100644
--- a/build.fsx
+++ b/build.fsx
@@ -197,6 +197,8 @@ Target "CopyOutput" <| fun _ ->
       "contrib/testkits/Akka.TestKit.NUnit" 
       "contrib/testkits/Akka.TestKit.Xunit2" 
       "contrib/serializers/Akka.Serialization.Wire" 
+      "contrib/cluster/Akka.Cluster.Tools"
+      "contrib/cluster/Akka.Cluster.Sharding"
       ]
     |> List.iter copyOutput
 
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
index 9726833f1fc..8eb9aa4d2f2 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
@@ -92,6 +92,7 @@
     <EmbeddedResource Include="reference.conf" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Akka.Cluster.Sharding.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.nuspec b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.nuspec
new file mode 100644
index 00000000000..143811402ad
--- /dev/null
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>@project@</id>
+    <title>@project@@title@</title>
+    <version>@build.number@</version>
+    <authors>@authors@</authors>
+    <owners>@authors@</owners>
+    <description>Sharded actors with managed lifecycle for Akka.NET cluster</description>
+    <licenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
+    <iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <releaseNotes>@releaseNotes@</releaseNotes>
+    <copyright>@copyright@</copyright>
+    <tags>@tags@ cluster sharding</tags>
+    @dependencies@
+    @references@
+  </metadata>
+</package>
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj
index 1b59ba70576..73279bdc832 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj
@@ -77,6 +77,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Client\reference.conf" />
+    <None Include="Akka.Cluster.Tools.nuspec" />
     <None Include="packages.config" />
     <EmbeddedResource Include="Singleton\reference.conf" />
     <EmbeddedResource Include="PublishSubscribe\reference.conf" />
diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.nuspec b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.nuspec
new file mode 100644
index 00000000000..b23087033df
--- /dev/null
+++ b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>@project@</id>
+    <title>@project@@title@</title>
+    <version>@build.number@</version>
+    <authors>@authors@</authors>
+    <owners>@authors@</owners>
+    <description>Distributed publish/subscribe, client and singleton support for Akka.NET cluster</description>
+    <licenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
+    <iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <releaseNotes>@releaseNotes@</releaseNotes>
+    <copyright>@copyright@</copyright>
+    <tags>@tags@ cluster</tags>
+    @dependencies@
+    @references@
+  </metadata>
+</package>