Merge "Make type conversion explicit" into nextgenv2