Merging updates from uos