added proxy conditionals
Merge branch 'master' into tiaa-proto