Merge "Akka config change"