Synced to upstream.