Merging updates from upstream