Merge conflict resolved
Add support for calling API over proxy