diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/ExternalContextWrapper.java b/spring-faces/src/main/java/org/springframework/faces/webflow/ExternalContextWrapper.java
new file mode 100644
index 00000000..e1e202b5
--- /dev/null
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/ExternalContextWrapper.java
@@ -0,0 +1,191 @@
+package org.springframework.faces.webflow;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.context.ExternalContext;
+
+class ExternalContextWrapper extends ExternalContext {
+
+	protected ExternalContext delegate;
+
+	public ExternalContextWrapper(ExternalContext delegate) {
+		this.delegate = delegate;
+	}
+
+	public void dispatch(String path) throws IOException {
+		delegate.dispatch(path);
+	}
+
+	public String encodeActionURL(String url) {
+		return delegate.encodeActionURL(url);
+	}
+
+	public String encodeNamespace(String name) {
+		return delegate.encodeNamespace(name);
+	}
+
+	public String encodeResourceURL(String url) {
+		return delegate.encodeResourceURL(url);
+	}
+
+	public Map getApplicationMap() {
+		return delegate.getApplicationMap();
+	}
+
+	public String getAuthType() {
+		return delegate.getAuthType();
+	}
+
+	public Object getContext() {
+		return delegate.getContext();
+	}
+
+	public String getInitParameter(String name) {
+		return delegate.getInitParameter(name);
+	}
+
+	public Map getInitParameterMap() {
+		return delegate.getInitParameterMap();
+	}
+
+	public String getRemoteUser() {
+		return delegate.getRemoteUser();
+	}
+
+	public Object getRequest() {
+		return delegate.getRequest();
+	}
+
+	public String getRequestCharacterEncoding() {
+		return delegate.getRequestCharacterEncoding();
+	}
+
+	public String getRequestContentType() {
+		return delegate.getRequestContentType();
+	}
+
+	public String getRequestContextPath() {
+		return delegate.getRequestContextPath();
+	}
+
+	public Map getRequestCookieMap() {
+		return delegate.getRequestCookieMap();
+	}
+
+	public Map getRequestHeaderMap() {
+		return delegate.getRequestHeaderMap();
+	}
+
+	public Map getRequestHeaderValuesMap() {
+		return delegate.getRequestHeaderValuesMap();
+	}
+
+	public Locale getRequestLocale() {
+		return delegate.getRequestLocale();
+	}
+
+	public Iterator getRequestLocales() {
+		return delegate.getRequestLocales();
+	}
+
+	public Map getRequestMap() {
+		return delegate.getRequestMap();
+	}
+
+	public Map getRequestParameterMap() {
+		return delegate.getRequestParameterMap();
+	}
+
+	public Iterator getRequestParameterNames() {
+		return delegate.getRequestParameterNames();
+	}
+
+	public Map getRequestParameterValuesMap() {
+		return delegate.getRequestParameterValuesMap();
+	}
+
+	public String getRequestPathInfo() {
+		return delegate.getRequestPathInfo();
+	}
+
+	public String getRequestServletPath() {
+		return delegate.getRequestServletPath();
+	}
+
+	public URL getResource(String path) throws MalformedURLException {
+		return delegate.getResource(path);
+	}
+
+	public InputStream getResourceAsStream(String path) {
+		return delegate.getResourceAsStream(path);
+	}
+
+	public Set getResourcePaths(String path) {
+		return delegate.getResourcePaths(path);
+	}
+
+	public Object getResponse() {
+		return delegate.getResponse();
+	}
+
+	public String getResponseCharacterEncoding() {
+		return delegate.getResponseCharacterEncoding();
+	}
+
+	public String getResponseContentType() {
+		return delegate.getResponseContentType();
+	}
+
+	public Object getSession(boolean create) {
+		return delegate.getSession(create);
+	}
+
+	public Map getSessionMap() {
+		return delegate.getSessionMap();
+	}
+
+	public Principal getUserPrincipal() {
+		return delegate.getUserPrincipal();
+	}
+
+	public boolean isUserInRole(String role) {
+		return delegate.isUserInRole(role);
+	}
+
+	public void log(String message, Throwable exception) {
+		delegate.log(message, exception);
+	}
+
+	public void log(String message) {
+		delegate.log(message);
+	}
+
+	public void redirect(String url) throws IOException {
+		delegate.redirect(url);
+	}
+
+	public void setRequest(Object request) {
+		delegate.setRequest(request);
+	}
+
+	public void setRequestCharacterEncoding(String encoding) throws UnsupportedEncodingException {
+		delegate.setRequestCharacterEncoding(encoding);
+	}
+
+	public void setResponse(Object response) {
+		delegate.setResponse(response);
+	}
+
+	public void setResponseCharacterEncoding(String encoding) {
+		delegate.setResponseCharacterEncoding(encoding);
+	}
+}
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
index 199a1f00..df49570d 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
@@ -197,7 +197,7 @@ public class FlowFacesContext extends FacesContext {
 	}
 
 	public ExternalContext getExternalContext() {
-		return delegate.getExternalContext();
+		return new FlowExternalContext(delegate.getExternalContext());
 	}
 
 	public RenderKit getRenderKit() {
@@ -313,4 +313,29 @@ public class FlowFacesContext extends FacesContext {
 
 	}
 
+	private class FlowExternalContext extends ExternalContextWrapper {
+
+		private static final String CUSTOM_RESPONSE = "customResponse";
+
+		public FlowExternalContext(ExternalContext delegate) {
+			super(delegate);
+		}
+
+		public Object getResponse() {
+			if (context.getRequestScope().contains(CUSTOM_RESPONSE)) {
+				return context.getRequestScope().get(CUSTOM_RESPONSE);
+			}
+			return delegate.getResponse();
+		}
+
+		/**
+		 * Store the native response object to be used for the duration of the Faces Request
+		 */
+		public void setResponse(Object response) {
+			context.getRequestScope().put(CUSTOM_RESPONSE, response);
+			delegate.setResponse(response);
+		}
+
+	}
+
 }
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java
index d354043f..6527fb3c 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java
@@ -126,6 +126,9 @@ public class FlowViewStateManager extends StateManager {
 	 * JSF 1.1 version of state saving
 	 */
 	public javax.faces.application.StateManager.SerializedView saveSerializedView(FacesContext context) {
+		if (context.getViewRoot().isTransient()) {
+			return null;
+		}
 		if (!JsfUtils.isFlowRequest()) {
 			return delegate.saveSerializedView(context);
 		}
@@ -137,6 +140,9 @@ public class FlowViewStateManager extends StateManager {
 	 * JSF 1.2 version of state saving
 	 */
 	public Object saveView(FacesContext context) {
+		if (context.getViewRoot().isTransient()) {
+			return null;
+		}
 		if (!JsfUtils.isFlowRequest()) {
 			return delegate.saveView(context);
 		}