Merge "Fixups following changes to actor traversal" into devel/master