Merge "Simplified actor depth traversal algorithms" into devel/master