Add timeout to client, update config_db save