Merge branch 'fix_proxy'
Merge branch 'master' into v4.x