Merge "Enhance http proxy support"