Merge "Do not use ActorSystem.actorFor as it is deprecated"