Merge 0.8.12 release into master branch

Merge 0.8.12 release into master branch