Merge branch 'develop'
Merge branch 'develop'
Fix for the error in the CI build. Simpler tests.
Merge branch 'master' into develop