More merges with upstream