Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev