Commit before replace v2 proxy.
May 28, 2014 on wcfsbs branch
May 28, 2014 on wcfsbs branch