Stable

Creating this pull request to merge some of the fixes in Stable branch to the latest 0.26 fixes branch. Not all commits are necessary we need to pick out ones needed.