Upstream commits.