Merge branch 'origin/3.0.0-wip'