Feature/merge s37.6 into develop

This pulls all changes from release/0.9a37 into develop.
Once this is merged into develop I will create release/0.9.0.