Merge "For loop condition fix"