Merge branch 'develop'
Fix tests
Merge branch 'master' into develop