Merge branch 'assume-outside-actor'