Merging from upstream.