Updates

Sync with upstream.