Merge "Actor updates to support SO"