Merge "Fix Akka exception: cannot use non-static local Creator to create actors"