Sync with 3.0