Cross merge the fix for broken test case LoopWhile_Fibonaci

Merge the fix for broken test case ``LoopWhile_Fibonaci``