Merge branch '3.0.0-wip'