Merge branch 'proxy'