Merge "Fix stack overflow for mutual recursion."