final sanity found issues with last minute changes
Merge branch 'v1.0' into develop
Merge branch 'develop'