Sync with 3.0.0 wip