Upstream update (part 2)