diff --git a/docs/pom.xml b/docs/pom.xml
index 39d84f497..b6dc7ed28 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -123,10 +123,10 @@
 							<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
 							<attributes>
             						<spring-cloud-stream-version>${project.version}</spring-cloud-stream-version>
-            						<docs-url>http://cloud.spring.io/</docs-url>
-            						<docs-version></docs-version>
-<!--             						<docs-version>${project.version}/</docs-version> -->
-<!--             						<docs-url>http://cloud.spring.io/spring-cloud-static/</docs-url> -->
+<!--             						<docs-url>http://cloud.spring.io/</docs-url> -->
+<!--             						<docs-version></docs-version> -->
+            						<docs-version>${project.version}/</docs-version>
+            						<docs-url>http://cloud.spring.io/spring-cloud-static/</docs-url>
         					</attributes>
 						</configuration>
 						<executions>
diff --git a/docs/src/main/asciidoc/home.adoc b/docs/src/main/asciidoc/home.adoc
index a1822dfcc..0ed25a480 100644
--- a/docs/src/main/asciidoc/home.adoc
+++ b/docs/src/main/asciidoc/home.adoc
@@ -8,10 +8,10 @@ Sabby Anandan; Marius Bogoevici; Eric Bottard; Mark Fisher; Ilayaperumal Gopinat
 The reference documentation consists of the following sections:
 
 [horizontal]
-<<spring-cloud-stream.adoc#spring-cloud-stream-reference,Overview>> :: History, Quick Start, Concepts, Architecture Overview, Binder Abstraction, and Core Features
-{docs-url}spring-cloud-stream-binder-rabbit/{docs-version}spring-cloud-stream-binder-rabbit.html[Rabbit MQ Binder] :: Spring Cloud Stream binder reference for Rabbit MQ
-{docs-url}spring-cloud-stream-binder-kafka/{docs-version}spring-cloud-stream-binder-kafka.html#_apache_kafka_binder[Apache Kafka Binder] :: Spring Cloud Stream binder reference for Apache Kafka
-{docs-url}spring-cloud-stream-binder-kafka/{docs-version}spring-cloud-stream-binder-kafka.html#_kafka_streams_binder[Apache Kafka Streams Binder] :: Spring Cloud Stream binder reference for Apache Kafka Streams
+<<spring-cloud-stream-guide.adoc#spring-cloud-stream-reference,Overview>> :: History, Quick Start, Concepts, Architecture Overview, Binder Abstraction, and Core Features
+{docs-url}spring-cloud-stream-binder-rabbit/{docs-version}spring-cloud-stream-binder-rabbit-guide.html[Rabbit MQ Binder] :: Spring Cloud Stream binder reference for Rabbit MQ
+{docs-url}spring-cloud-stream-binder-kafka/{docs-version}spring-cloud-stream-binder-kafka-guide.html#_apache_kafka_binder[Apache Kafka Binder] :: Spring Cloud Stream binder reference for Apache Kafka
+{docs-url}spring-cloud-stream-binder-kafka/{docs-version}spring-cloud-stream-binder-kafka-guide.html#_kafka_streams_binder[Apache Kafka Streams Binder] :: Spring Cloud Stream binder reference for Apache Kafka Streams
 <<binders.adoc#binders,Additional Binders>> :: A collection of Partner maintained binder implementations for Spring Cloud Stream (e.g., Azure Event Hubs, Google PubSub, Solace PubSub+)
 https://github.com/spring-cloud/spring-cloud-stream-samples/[Spring Cloud Stream Samples]  :: A curated collection of repeatable Spring Cloud Stream samples to walk through the features
 
diff --git a/docs/src/main/asciidoc/spring-cloud-stream.adoc b/docs/src/main/asciidoc/spring-cloud-stream-guide.adoc
similarity index 100%
rename from docs/src/main/asciidoc/spring-cloud-stream.adoc
rename to docs/src/main/asciidoc/spring-cloud-stream-guide.adoc
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
index 2038c08a6..638d54d3a 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingHandlerAdvise.java
@@ -30,6 +30,7 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyN
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.Validator;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 /**
  * @author Oleg Zhurakousky
@@ -57,6 +58,7 @@ public class BindingHandlerAdvise implements ConfigurationPropertiesBindHandlerA
 
 	@Override
 	public BindHandler apply(BindHandler bindHandler) {
+		System.out.println("Hello " + bindHandler);
 		BindHandler handler = new ValidationBindHandler(this.validator) {
 			@Override
 			public <T> Bindable<T> onStart(ConfigurationPropertyName name,