Merge "Fix implicit conversions"