Merge "Stop using depreacted base_convert"