Merge "Fix service clients for kwargs as None or 0"