fix condition
Merge branch 'master' into support-proxy