diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml
index 3ecde301b..8e559348a 100644
--- a/spring-cloud-function-samples/function-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -24,7 +24,7 @@
 		<java.version>1.8</java.version>
 		<wrapper.version>1.0.9.RELEASE</wrapper.version>
 		<aws-lambda-events.version>1.2.1</aws-lambda-events.version>
-		<reactor.version>3.0.7.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<spring-cloud-stream-servlet.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
 		<start-class>example.Config</start-class>
@@ -37,12 +37,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
+			<artifactId>spring-cloud-function-web</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml
index 6380d0c27..4daf6aeb7 100644
--- a/spring-cloud-function-samples/function-sample-compiler/pom.xml
+++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml
@@ -21,18 +21,14 @@
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<spring-cloud-stream.version>Ditmars.RELEASE</spring-cloud-stream.version>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<wrapper.version>1.0.9.RELEASE</wrapper.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
+			<artifactId>spring-cloud-function-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -61,11 +57,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-servlet</artifactId>
-				<version>${spring-cloud-stream-servlet.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java
index 8964a9fec..1fd4a958f 100644
--- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java
+++ b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java
@@ -44,7 +44,7 @@ public class SampleCompiledConsumerTests {
 	@Test
 	public void print() {
 		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/stream/test", "it works", String.class))
+				"http://localhost:" + port + "/test", "it works", String.class))
 						.isEqualTo("it works");
 		assertEquals("it works", Reference.instance);
 	}
diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java
index ddd098fae..29435826c 100644
--- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java
+++ b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java
@@ -43,7 +43,7 @@ public class SampleCompiledFunctionTests {
 	@Test
 	public void lowercase() {
 		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/stream/test", "it works", String.class))
+				"http://localhost:" + port + "/test", "it works", String.class))
 						.isEqualTo("it works!!!");
 	}
 
diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml
index 9dec74626..29c06b583 100644
--- a/spring-cloud-function-samples/function-sample-pof/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pof/pom.xml
@@ -20,7 +20,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<spring-cloud-stream-servlet.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
 	</properties>
@@ -28,12 +28,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
-			<version>${spring-cloud-stream-servlet.version}</version>
+			<artifactId>spring-cloud-function-web</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml
index 0be547834..b347a8dba 100644
--- a/spring-cloud-function-samples/function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml
@@ -21,17 +21,13 @@
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.9.RELEASE</wrapper.version>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
+			<artifactId>spring-cloud-function-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
index ec3b784d4..d3e0ea5ce 100644
--- a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
+++ b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
@@ -1,3 +1,3 @@
-boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.SR3
+boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE
 dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream
 dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit
\ No newline at end of file
diff --git a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
index 8cc4f78f9..bd31a00de 100644
--- a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
+++ b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
@@ -40,7 +40,7 @@ public class SampleApplicationTests {
 	@Test
 	public void words() {
 		assertThat(new TestRestTemplate()
-				.getForObject("http://localhost:" + port + "/stream/words", String.class))
+				.getForObject("http://localhost:" + port + "/words", String.class))
 						.isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
 	}
 
@@ -48,14 +48,14 @@ public class SampleApplicationTests {
 	public void uppercase() {
 		// TODO: make this work with a JSON stream as well (like in WebFlux)
 		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/stream/uppercase", "[{\"value\":\"foo\"}]",
+				"http://localhost:" + port + "/uppercase", "[{\"value\":\"foo\"}]",
 				String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
 	}
 
 	@Test
 	public void lowercase() {
 		assertThat(new TestRestTemplate().postForObject(
-				"http://localhost:" + port + "/stream/lowercase", "[{\"value\":\"Foo\"}]",
+				"http://localhost:" + port + "/lowercase", "[{\"value\":\"Foo\"}]",
 				String.class)).isEqualTo("[{\"value\":\"foo\"}]");
 	}
 
diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml
index aec9a5390..4bf0811f8 100644
--- a/spring-cloud-function-samples/function-sample-task/pom.xml
+++ b/spring-cloud-function-samples/function-sample-task/pom.xml
@@ -21,7 +21,7 @@
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>1.0.9.RELEASE</wrapper.version>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 	</properties>
 
 	<dependencies>
@@ -31,11 +31,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
+			<artifactId>spring-cloud-function-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml
index 03e82d347..782f4e19a 100644
--- a/spring-cloud-function-samples/function-sample/pom.xml
+++ b/spring-cloud-function-samples/function-sample/pom.xml
@@ -20,18 +20,14 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<wrapper.version>1.0.9.RELEASE</wrapper.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-servlet</artifactId>
+			<artifactId>spring-cloud-function-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties
index b2575c4dc..a906ce5cc 100644
--- a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties
+++ b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties
@@ -1,9 +1,3 @@
-<<<<<<< HEAD:spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties
 boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE
-dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT
+dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream
 dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit
-=======
-boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.RELEASE
-exclusions.spring-cloud-function-stream-binder-servlet: org.springframework.cloud:spring-cloud-stream-binder-servlet
-dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-stream-binder-rabbit
->>>>>>> Migrate to servlet binder for web features:spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties
diff --git a/spring-cloud-stream-binder-servlet/pom.xml b/spring-cloud-stream-binder-servlet/pom.xml
index a5f3a2ad9..fb8a1ef90 100644
--- a/spring-cloud-stream-binder-servlet/pom.xml
+++ b/spring-cloud-stream-binder-servlet/pom.xml
@@ -16,7 +16,7 @@
 	</parent>
 
 	<properties>
-		<reactor.version>3.1.1.RELEASE</reactor.version>
+		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<java.version>1.8</java.version>
 	</properties>