Merge "Remove Recursion in Session Management/Traversal" into main