Merge "Make int32_t conversion explicit" into main