Merge pull request #1357 from Azure/release-0.8.8

Merge Release 0.8.8 into master
Merge pull request #1358 from Azure/master

Merge release-0.8.8 from master to dev