proxy update
Merge branches 'new_branch_name' and 'master'