Merge "More changes to actor code"