reduced breaking API changes

src/core/Akka.Remote/Serialization/DaemonMsgCreateSerializer.cs

@@ -96,7 +96,9 @@ private Props PropsFromProto(Proto.Msg.PropsData protoProps)
                 );
             }
 
-            return Props.Create(actorClass, args).WithDeploy(DeployFromProto(protoProps.Deploy));
+            // we don't want to break proto contract, thankfully DynamicProps
+            // are using fallback to Activator instantiation anyway
+            return new Props(DeployFromProto(protoProps.Deploy), actorClass, args);
         }
 
         //

src/core/Akka.Tests/Actor/LocalActorRefProviderSpec.cs

@@ -33,6 +33,7 @@ public void A_LocalActorRefs_ActorCell_must_not_retain_its_original_Props_when_T
                 {
                     var childPropsAfterTermination = ((LocalActorRef)child).Underlying.Props;
                     Assert.NotEqual(childPropsBeforeTermination, childPropsAfterTermination);
+                    Assert.IsType<TerminatedProps>(childPropsAfterTermination);
                 });
         }
 

src/core/Akka/Actor/ActorCell.FaultHandling.cs

@@ -66,6 +66,10 @@ private void FaultRecreate(Exception cause)
                     // if the actor fails in preRestart, we can do nothing but log it: it’s best-effort
 
                     failedActor.AroundPreRestart(cause, optionalMessage);
+                    if (failedActor is IActorStash stashed)
+                    {
+                        stashed.Stash.UnstashAll();
+                    }
                 }
                 catch (Exception e)
                 {
@@ -279,6 +283,11 @@ private void FinishTerminate()
             try
             {
                 a?.AroundPostStop();
+
+                if (a is IActorStash stashed)
+                {
+                    stashed.Stash.UnstashAll();
+                }
             }
             catch (Exception x)
             {
@@ -303,7 +312,7 @@ private void FinishTerminate()
                                     Publish(new Debug(_self.Path.ToString(), ActorType, "Stopped"));
 
                                 ClearActor(a);
-                                Dispose();
+                                ClearActorCell();
 
                                 _actor = null;
 

src/core/Akka/Actor/ActorCell.cs

@@ -23,7 +23,7 @@ namespace Akka.Actor
     /// <summary>
     /// TBD
     /// </summary>
-    public partial class ActorCell : IUntypedActorContext, ICell, IDisposable
+    public partial class ActorCell : IUntypedActorContext, ICell
     {
         /// <summary>NOTE! Only constructor and ClearActorFields is allowed to update this</summary>
         private IInternalActorRef _self;
@@ -354,9 +354,9 @@ protected virtual ActorBase CreateNewActorInstance()
         {
             var actor = _scope.Create();
 
-            if (actor is IWithUnboundedStash stashed)
+            if (actor is IActorStash stashed)
             {
-                stashed.Stash = this.CreateStash(_props.Type);
+                stashed.Stash = this.CreateStash(stashed);
             }
 
             if (actor is IInitializableActor initializable)
@@ -426,10 +426,11 @@ public virtual void SendMessage(IActorRef sender, object message)
         /// <summary>
         /// TBD
         /// </summary>
-        public void Dispose()
+        protected void ClearActorCell()
         {
             UnstashAll();
             _scope.Dispose();
+            _props = TerminatedProps.Instance;
         }
 
         /// <summary>