Pull from Azure:release-0.8.11 to sethusrinivasan:dev