backport actor changes to tutorial