Index: jsf-ri/src/main/java/com/sun/faces/config/InitFacesContext.java
===================================================================
--- jsf-ri/src/main/java/com/sun/faces/config/InitFacesContext.java	(revision 9183)
+++ jsf-ri/src/main/java/com/sun/faces/config/InitFacesContext.java	(working copy)
@@ -40,6 +40,7 @@
 
 package com.sun.faces.config;
 
+import com.sun.faces.RIConstants;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.ResponseStream;
@@ -65,6 +66,7 @@
 
 import com.sun.faces.context.ApplicationMap;
 import com.sun.faces.context.InitParameterMap;
+import javax.faces.event.PhaseId;
 
 /**
  * A special, minimal implementation of FacesContext used at application initialization time.
@@ -72,7 +74,7 @@
  */
 public class InitFacesContext extends FacesContext {
 
-    private ExternalContext ec;
+    private ServletContextAdapter ec;
     private UIViewRoot viewRoot;
     private FacesContext orig;
     private Map<Object,Object> attributes;
@@ -94,7 +96,19 @@
         ec = new ServletContextAdapter(sc);
         orig = FacesContext.getCurrentInstance();
         setCurrentInstance(this);
+        sc.setAttribute(INIT_FACES_CONTEXT_ATTR_NAME, this);
     }
+    
+    private static final String INIT_FACES_CONTEXT_ATTR_NAME = RIConstants.FACES_PREFIX + "InitFacesContext";
+    
+    static InitFacesContext getInstance(ServletContext sc) {
+        InitFacesContext result = (InitFacesContext) sc.getAttribute(INIT_FACES_CONTEXT_ATTR_NAME);
+        if (null != result) {
+            result.callSetCurrentInstance();
+        }
+        
+        return result;
+    }
 
     void callSetCurrentInstance() {
         setCurrentInstance(this);
@@ -197,10 +211,23 @@
 
     public void release() {
         setCurrentInstance(orig);
+        getExternalContext().getApplicationMap().remove(INIT_FACES_CONTEXT_ATTR_NAME);
         if (null != attributes) {
             attributes.clear();
             attributes = null;
         }
+        ec.release();
+        ec = null;
+        elContext = null;
+        if (null != viewRoot) {
+            Map viewMap = viewRoot.getViewMap(false);
+            if (null != viewMap) {
+                viewMap.clear();
+            }
+        }
+        viewRoot = null;
+        orig = null;
+
     }
 
     public void renderResponse() { }
@@ -231,6 +258,12 @@
 
         public void dispatch(String path) throws IOException {
         }
+        
+        private void release() {
+            servletContext = null;
+            applicationMap = null;
+            initMap = null;
+        }
 
         public String encodeActionURL(String url) {
             return null;
Index: jsf-ri/src/main/java/com/sun/faces/config/ConfigureListener.java
===================================================================
--- jsf-ri/src/main/java/com/sun/faces/config/ConfigureListener.java	(revision 9183)
+++ jsf-ri/src/main/java/com/sun/faces/config/ConfigureListener.java	(working copy)
@@ -299,7 +299,10 @@
         ServletContext context = sce.getServletContext();
         InitFacesContext initContext = null;
         try {
-            initContext = new InitFacesContext(context);
+            initContext = InitFacesContext.getInstance(context);
+            if (null == initContext) {
+                    initContext = new InitFacesContext(context);
+            }
 
             if (webAppListener != null) {
                 webAppListener.contextDestroyed(sce);
Index: jsf-test/build.xml
===================================================================
--- jsf-test/build.xml	(revision 9183)
+++ jsf-test/build.xml	(working copy)
@@ -79,7 +79,8 @@
                     JAVASERVERFACES-2079,
                     JAVASERVERFACES-2065,
                     JAVASERVERFACES-1995,
-                    JAVASERVERFACES_SPEC_PUBLIC-762" />
+                    JAVASERVERFACES_SPEC_PUBLIC-762,
+                    GLASSFISH-16917" />
 <!-- Test Driven Development
 ,
                     JAVASERVERFACES_SPEC_PUBLIC-758
Index: jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/java/com/mycompany/leaktest2/TestBean.java
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/java/com/mycompany/leaktest2/TestBean.java	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/java/com/mycompany/leaktest2/TestBean.java	(revision 0)
@@ -0,0 +1,9 @@
+package com.mycompany.leaktest2;
+
+public class TestBean {
+    
+    public String getHello() {
+        return "Hello";
+    }
+    
+}
\ No newline at end of file
Index: jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/beans.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/beans.xml	(revision 0)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
Index: jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/web.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-cdi-only/src/main/webapp/WEB-INF/web.xml	(revision 0)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+</web-app>
Index: jsf-test/GLASSFISH-16917/leaktest2-cdi-only/pom.xml
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-cdi-only/pom.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-cdi-only/pom.xml	(revision 0)
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.mycompany</groupId>
+    <artifactId>leaktest2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>leaktest2 Web App</name>
+
+    <properties>
+        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <version>6.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerArguments>
+                        <endorseddirs>${endorsed.dir}</endorseddirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>leaktest2</finalName>
+    </build>
+    <repositories>
+        <repository>
+            <url>http://download.java.net/maven/2/</url>
+            <id>jsf20</id>
+            <layout>default</layout>
+            <name>Repository for library Library[jsf20]</name>
+        </repository>
+    </repositories>
+</project>
Index: jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/java/com/mycompany/leaktest2/TestBean.java
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/java/com/mycompany/leaktest2/TestBean.java	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/java/com/mycompany/leaktest2/TestBean.java	(revision 0)
@@ -0,0 +1,10 @@
+package com.mycompany.leaktest2;
+
+@javax.faces.bean.ManagedBean
+public class TestBean {
+    
+    public String getHello() {
+        return "Hello";
+    }
+    
+}
\ No newline at end of file
Index: jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/webapp/WEB-INF/web.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/src/main/webapp/WEB-INF/web.xml	(revision 0)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+</web-app>
Index: jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/pom.xml
===================================================================
--- jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/pom.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/leaktest2-ManagedBean-only/pom.xml	(revision 0)
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.mycompany</groupId>
+    <artifactId>leaktest2-managed-bean</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>leaktest2 Web App</name>
+
+    <properties>
+        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <version>6.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerArguments>
+                        <endorseddirs>${endorsed.dir}</endorseddirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>leaktest2-managed-bean</finalName>
+    </build>
+    <repositories>
+        <repository>
+            <url>http://download.java.net/maven/2/</url>
+            <id>jsf20</id>
+            <layout>default</layout>
+            <name>Repository for library Library[jsf20]</name>
+        </repository>
+    </repositories>
+</project>
Index: jsf-test/GLASSFISH-16917/build.xml
===================================================================
--- jsf-test/GLASSFISH-16917/build.xml	(revision 0)
+++ jsf-test/GLASSFISH-16917/build.xml	(revision 0)
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+<!-- ************ JSF build file ************************************** -->
+<project name="GLASSFISH-16917" default="test" basedir=".">
+
+    <property file="../../build.properties"/>
+    <property name="one.thousand" value="i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i" />
+
+
+    <path id="16917.classpath">  
+        <path refid="html.classpath" />
+        <pathelement location="${basedir}/i_jsf_16917_htmlunit/target/classes"/>
+    </path>
+
+    <import file="${jsf.build.home}/common/ant/common.xml"/>
+
+    <target name="build">
+        <jsf.mvn dir="${basedir}/leaktest2-cdi-only" goals="install" />
+        <jsf.mvn dir="${basedir}/leaktest2-ManagedBean-only" goals="install" />
+    </target>    
+
+    <target name="clean">
+        <jsf.mvn dir="${basedir}/leaktest2-cdi-only" goals="clean" />
+        <jsf.mvn dir="${basedir}/leaktest2-ManagedBean-only" goals="clean" />    </target>    
+
+    <target name="install">
+    </target>    
+
+    <target name="remove">
+          <undeploy.artifact
+                artifact="${basedir}/leaktest2-cdi-only/target/leaktest2.war"
+                appName="leaktest2"/>
+          <undeploy.artifact
+                artifact="${basedir}/leaktest2-ManagedBean-only/target/leaktest2-managed-bean.war"
+                appName="leaktest2-managed-bean"/>
+    </target>    
+
+    <target name="test" depends="define.scenario.aware.port">
+        <for list="${one.thousand}" param="app" trim="true"><sequential>
+          <deploy.artifact
+                artifact="${basedir}/leaktest2-cdi-only/target/leaktest2.war"
+                appName="leaktest2"/>
+          <deploy.artifact
+                artifact="${basedir}/leaktest2-ManagedBean-only/target/leaktest2-managed-bean.war"
+                appName="leaktest2-managed-bean"/>
+          <undeploy.artifact
+                artifact="${basedir}/leaktest2-cdi-only/target/leaktest2.war"
+                appName="leaktest2"/>
+          <undeploy.artifact
+                artifact="${basedir}/leaktest2-ManagedBean-only/target/leaktest2-managed-bean.war"
+                appName="leaktest2-managed-bean"/>
+
+        </sequential></for>
+    </target>    
+
+</project>