Updated changes from upstream.