Merge "Fix looping logic bugs."