Merge "fix -Wunreachable-code-loop-increment"