I have made changes in the api_client.mustache template file. Please replace your cloned api_client.mustache with this file.