proxy change
Merge branch 'master' into tiaa-proto
use IP instead of domain name