[3.0] Sync with master