Fetch from upstream: 4797.