Merge "Bug fix for control-flow construction involving nested loops."