Merge "Fix typo in stack traversal" into rvc-dev