Merging master -> dev for release 0.8.12

Fixing some merge conflicts in merging master->dev