Merge master branch to dev for 0.8.12 release

Merge master branch to dev for 0.8.12 release