Merging changes from upstream.