Merge Upstream changes