Feanil/master with release

These are the various fixes that were merged into the release after it was cut, including two hotfixes and two bug fixes that came in before the release.