Merge "Avoid undefined compiler behavior"