Updated from upstream/ie