Merge "Fix implicit conversion"