Merge branch 'master' into segregated
Fixed conflicts