Added fix for API client.
Fixed merge conflicts