Merge "Smooth down API proxy config"