Update from upstream 8.0