Merge "Stop warning on client_parameters"