Merge branch 'hotfix/3.0.0dev6'
3.0.0
Merge branch 'master' into develop