Merge "Fixed redefinition of 'i' with a different type error"