Merge "Allow type conversion from KmVersion to int" into main