Upstream merges