Release

Merge hotfixes to release back into master