Merge branch 'master' into develop
Fixing streams version constraint
Merge branch 'develop'