Merge "Avoid implicit type conversion between signed/unsigned"