Merge "Add proxy support"