Merge with upstream changes