Client adjusted for LoadBalancer
Merge remote-tracking branch 'origin/newfresh' into newfresh
Client adjusted for LoadBalancer