Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip