Pull request  to sync up with Azure:master to sethusrinivasan:master