review proxy & add proxy.name

Change-Id: I0deb5aa8f6e720da5abac3ffebc6c71ad1a030b6
Merge "review proxy & add proxy.name" into 0.6.x