diff --git a/src/docs/latest/java/CoreConcepts.html b/src/docs/latest/java/CoreConcepts.html
index 6205a3eb9e6..84c5c2f8847 100644
--- a/src/docs/latest/java/CoreConcepts.html
+++ b/src/docs/latest/java/CoreConcepts.html
@@ -48,4 +48,3 @@ <h1 id="Introduction-to-Lagom-concepts"><a class="section-marker" href="#Introdu
   </li>
 </ul>
 
-
diff --git a/src/docs/latest/java/DevEnvironment.html b/src/docs/latest/java/DevEnvironment.html
index 6849c8ae62c..d37a62f3260 100644
--- a/src/docs/latest/java/DevEnvironment.html
+++ b/src/docs/latest/java/DevEnvironment.html
@@ -59,6 +59,7 @@ <h1 id="Development-Environment"><a class="section-marker" href="#Development-En
     elasticsearch / &quot;bin&quot; / &quot;elasticsearch&quot;
   }
 
+  import scala.sys.process._
   val process = Process(binFile.getAbsolutePath, elasticsearch).run(log)
   log.info(&quot;Elastic search started on port 9200&quot;)
 
diff --git a/src/docs/latest/java/Home.html b/src/docs/latest/java/Home.html
index 3612952df82..8f613452e0d 100644
--- a/src/docs/latest/java/Home.html
+++ b/src/docs/latest/java/Home.html
@@ -1,6 +1,5 @@
 
 
-
     <h2>Welcome to Lagom</h2>
     <ol>
     <li>
diff --git a/src/docs/latest/java/Migration15.html b/src/docs/latest/java/Migration15.html
index 6623f52f35c..94c22dddc70 100644
--- a/src/docs/latest/java/Migration15.html
+++ b/src/docs/latest/java/Migration15.html
@@ -39,6 +39,16 @@ <h1 id="Lagom-1.5-Migration-Guide"><a class="section-marker" href="#Lagom-1.5-Mi
 <p>Cluster formation now also supports <a href="Cluster.html#Joining-during-production-(Akka-Cluster-Bootstrap)">Cluster Bootstrapping</a> as a new way to form a cluster.</p>
 <p>These new defaults may require at least two changes on your codebase. First, if you want to opt-in to cluster bootstrapping you must make sure you don&rsquo;t set <code>seed-nodes</code>. <code>seed-nodes</code> always takes precedence over any other cluster formation mechanism. Second, if you use Cluster Bootstrapping, you will have to setup a <a href="https://doc.akka.io/docs/akka/2.5/discovery/index.html">discovery</a> mechanism (see the <a href="Cluster.html#Akka-Discovery">Lagom Cluster reference guide</a> for more details).</p><h4 id="Service-Location"><a class="section-marker" href="#Service-Location">§</a>Service Location</h4>
 <p>You no longer have a <code>ServiceLocator</code> provided by the tooling libraries so you will have to provide one of your choice. We recommend using the new <a href="https://github.com/lagom/lagom-akka-discovery-service-locator"><code>lagom-akka-discovery-service-locator</code></a> which is implemented using <a href="https://doc.akka.io/docs/akka/current/discovery/index.html">Akka Service Discovery</a> implementations.</p>
+<p>You first need to add the following dependency to each service implementation in your <code>build.sbt</code>.</p>
+<pre class="prettyprint"><code>&quot;com.lightbend.lagom&quot; %% &quot;lagom-javadsl-akka-discovery-service-locator&quot; % &quot;1.0.0&quot;
+</code></pre>
+<p>or if you are using <code>maven</code>.</p>
+<pre class="prettyprint"><code>&lt;dependency&gt;
+    &lt;groupId&gt;com.lightbend.lagom&lt;/groupId&gt;
+    &lt;artifactId&gt;lagom-javadsl-akka-discovery-service-locator_2.12&lt;/artifactId&gt;
+    &lt;version&gt;1.0.0&lt;/version&gt;
+&lt;/dependency&gt;
+</code></pre>
 <p>Read the <a href="https://github.com/lagom/lagom-akka-discovery-service-locator">docs</a> of the new <code>lagom-akka-discovery-service-locator</code> for details on how to setup the Akka Service Discovery <a href="https://doc.akka.io/docs/akka/current/discovery/index.html">method</a>. For example,</p>
 <pre class="prettyprint"><code>akka {
   discovery {
diff --git a/src/docs/latest/java/ReferenceGuide.html b/src/docs/latest/java/ReferenceGuide.html
index 9d35e2d707c..7e4f3538f4f 100644
--- a/src/docs/latest/java/ReferenceGuide.html
+++ b/src/docs/latest/java/ReferenceGuide.html
@@ -1,6 +1,5 @@
 <h1 id="Lagom-reference-guide"><a class="section-marker" href="#Lagom-reference-guide">§</a>Lagom reference guide</h1>
 
-
     <h2>Configuring builds and the development environment</h2>
     <ol>
     <li>
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.CircuitBreakerId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.CircuitBreakerId.html
index 01e01f9a64e..b2e1ee7b9e7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.CircuitBreakerId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.CircuitBreakerId.html
@@ -268,11 +268,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.NamedCircuitBreaker.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.NamedCircuitBreaker.html
index a813a6f6a98..5e442259fbf 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.NamedCircuitBreaker.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.NamedCircuitBreaker.html
@@ -331,11 +331,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.html
index 43b06a21508..065d8f3406c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/CircuitBreaker.html
@@ -282,11 +282,7 @@ <h4>identifiedBy</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html
index e51f195c08b..be60f671dad 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html
@@ -299,11 +299,7 @@ <h4>doWithService</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Call.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Call.html
index d1674fd56d6..3fe8a0b36b9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Call.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Call.html
@@ -524,11 +524,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.CallId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.CallId.html
index d1a9ce0c985..9e6f21dd8c2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.CallId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.CallId.html
@@ -158,11 +158,7 @@ <h3>Methods inherited from class&nbsp;<a href="https://docs.oracle.com/javase/8/
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.NamedCallId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.NamedCallId.html
index efe1595be18..bd14afc69c5 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.NamedCallId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.NamedCallId.html
@@ -288,11 +288,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.PathCallId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.PathCallId.html
index 953f82669a0..98e2751da93 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.PathCallId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.PathCallId.html
@@ -288,11 +288,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.Property.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.Property.html
index 707ccfbef25..6da5707c69e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.Property.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.Property.html
@@ -291,11 +291,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.html
index cb315b19d1f..1bbf934ee6e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.Properties.html
@@ -243,11 +243,7 @@ <h4>withProperty</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.RestCallId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.RestCallId.html
index 59ce89ad92a..39574d3b985 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.RestCallId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.RestCallId.html
@@ -313,11 +313,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.ServiceCallHolder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.ServiceCallHolder.html
index 0301337f33c..aaa24a1ab30 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.ServiceCallHolder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.ServiceCallHolder.html
@@ -124,11 +124,7 @@ <h2 title="Interface Descriptor.ServiceCallHolder" class="title">Interface Descr
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicCall.html
index c08cd93db71..633cb42e7e1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicCall.html
@@ -329,11 +329,7 @@ <h4>withProperty</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicHolder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicHolder.html
index 5c91399718e..8145aa3d42f 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicHolder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.TopicHolder.html
@@ -124,11 +124,7 @@ <h2 title="Interface Descriptor.TopicHolder" class="title">Interface Descriptor.
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.html
index 32319ee7b63..a7ca12fe6f8 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Descriptor.html
@@ -879,11 +879,7 @@ <h4>withTopics</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalMessageTypeException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalMessageTypeException.html
index 24cd622564f..59a689ba6ff 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalMessageTypeException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalMessageTypeException.html
@@ -224,11 +224,7 @@ <h4>IllegalMessageTypeException</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalPathParameterException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalPathParameterException.html
index 64c4a977f45..9507f47a748 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalPathParameterException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/IllegalPathParameterException.html
@@ -223,11 +223,7 @@ <h4>IllegalPathParameterException</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService$.html
index f3f4776374b..e00d5e071a9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService$.html
@@ -335,11 +335,7 @@ <h4>named</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService.html
index bb12f661cc9..5fc32a0649b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaService.html
@@ -296,11 +296,7 @@ <h4>named</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport$.html
index 7dabc4e333c..8f4adb044a9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport$.html
@@ -278,11 +278,7 @@ <h4>methodForImpl</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall$.html
index bf9ecf1f9cb..0d1f7ad508f 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall$.html
@@ -229,11 +229,7 @@ <h4>ScalaMethodCall$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall.html
index 96d3347d21e..77bd0958b9c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.ScalaMethodCall.html
@@ -224,11 +224,7 @@ <h4>method</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.html
index aff42a4d8f2..25bed79f758 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ScalaServiceSupport.html
@@ -262,11 +262,7 @@ <h4>methodForImpl</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Service.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Service.html
index 5a9e8446fa5..d6b313e77f5 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Service.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/Service.html
@@ -1094,11 +1094,7 @@ <h4>topic</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceAcl.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceAcl.html
index b2fc4f87f10..e8962c72ff6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceAcl.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceAcl.html
@@ -314,11 +314,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceCall.html
index 2ffd7ea0119..c9d0c432c59 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceCall.html
@@ -306,11 +306,7 @@ <h4>withResponseHeader</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceInfo.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceInfo.html
index 2bfa1eeecfe..bf256969555 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceInfo.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceInfo.html
@@ -337,11 +337,7 @@ <h4>getAcls</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceLocator.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceLocator.html
index a6c1a20c7da..4619a2de8e9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceLocator.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/ServiceLocator.html
@@ -99,7 +99,7 @@ <h2 title="Interface ServiceLocator" class="title">Interface ServiceLocator</h2>
 <li class="blockList">
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../../com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html" title="class in com.lightbend.lagom.javadsl.client">CircuitBreakingServiceLocator</a>, <a href="../../../../../com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html" title="class in com.lightbend.lagom.javadsl.api">ConfigurationServiceLocator</a>, <a href="../../../../../com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html" title="class in com.lightbend.lagom.javadsl.client">ConfigurationServiceLocator</a></dd>
+<dd><a href="../../../../../com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html" title="class in com.lightbend.lagom.javadsl.client">CircuitBreakingServiceLocator</a>, <a href="../../../../../com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html" title="class in com.lightbend.lagom.javadsl.client">ConfigurationServiceLocator</a>, <a href="../../../../../com/lightbend/lagom/javadsl/api/ConfigurationServiceLocator.html" title="class in com.lightbend.lagom.javadsl.api">ConfigurationServiceLocator</a></dd>
 </dl>
 <hr>
 <br>
@@ -303,11 +303,7 @@ <h4>doWithService</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Message.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Message.html
index 83785ad1771..a65ed938e86 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Message.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Message.html
@@ -307,11 +307,7 @@ <h4>create</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/MetadataKey.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/MetadataKey.html
index a875108339e..88d5c41aa39 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/MetadataKey.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/MetadataKey.html
@@ -273,11 +273,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.GroupId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.GroupId.html
index fa99ae7cab8..ab72175e7ad 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.GroupId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.GroupId.html
@@ -182,11 +182,7 @@ <h4>groupId</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.html
index 0b773f9c237..19a28e99ab1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Subscriber.html
@@ -301,11 +301,7 @@ <h4>atLeastOnce</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.TopicId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.TopicId.html
index 933c5f77a2d..9c3b2f72ee4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.TopicId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.TopicId.html
@@ -265,11 +265,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.html
index 8ae0b3d625d..f0906ee872f 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/Topic.html
@@ -225,11 +225,7 @@ <h4>subscribe</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/KafkaProperties.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/KafkaProperties.html
index 0e56b52eb9e..b35a314a54e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/KafkaProperties.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/KafkaProperties.html
@@ -193,11 +193,7 @@ <h4>partitionKeyStrategy</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/PartitionKeyStrategy.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/PartitionKeyStrategy.html
index 1d348f8d583..1e481388b81 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/PartitionKeyStrategy.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/PartitionKeyStrategy.html
@@ -188,11 +188,7 @@ <h4>computePartitionKey</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-summary.html
index fb3abfe860f..96af4660c5a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-summary.html
@@ -125,11 +125,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api.b
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-tree.html
index 7864d60506c..d0910576734 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/kafka/package-tree.html
@@ -105,11 +105,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-summary.html
index 2995022bf79..8ad5d1744cb 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-summary.html
@@ -149,11 +149,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api.b
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-tree.html
index ff76ea7afd5..b3ca3424670 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/broker/package-tree.html
@@ -109,11 +109,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/DeserializationException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/DeserializationException.html
index c7020c889e4..8b6a17d5fb3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/DeserializationException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/DeserializationException.html
@@ -291,11 +291,7 @@ <h4>DeserializationException</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionMessage.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionMessage.html
index 8cbd90b627c..a7eddcebcff 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionMessage.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionMessage.html
@@ -298,11 +298,7 @@ <h4>hashCode</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionSerializer.html
index 666ed5eeba8..5dc9e8eb90c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/ExceptionSerializer.html
@@ -275,11 +275,7 @@ <h4>deserialize</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedDeserializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedDeserializer.html
index 1b88e14daf7..c775f9f5d7d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedDeserializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedDeserializer.html
@@ -194,11 +194,7 @@ <h4>deserialize</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedSerializer.html
index fece67a2025..01370f909ca 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.NegotiatedSerializer.html
@@ -210,11 +210,7 @@ <h4>serialize</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.html
index 0ac04098485..a6039dc4d1e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializer.html
@@ -335,11 +335,7 @@ <h4>serializerForResponse</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializers.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializers.html
index d7a179f4e7e..23fb0d3c39b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializers.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/MessageSerializers.html
@@ -208,11 +208,7 @@ <h4>STRING</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializer.html
index 17b15dfb9ab..392818db564 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializer.html
@@ -211,11 +211,7 @@ <h4>deserialize</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializers.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializers.html
index 775641bed8c..320c43c3a7d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializers.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/PathParamSerializers.html
@@ -457,11 +457,7 @@ <h4>collection</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/RawExceptionMessage.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/RawExceptionMessage.html
index 18d583f7784..0f88e39e2bb 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/RawExceptionMessage.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/RawExceptionMessage.html
@@ -356,11 +356,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializationException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializationException.html
index 8833f8d2a40..20e3ac788be 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializationException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializationException.html
@@ -291,11 +291,7 @@ <h4>SerializationException</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializerFactory.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializerFactory.html
index e970f44ee58..2e47572114e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializerFactory.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/SerializerFactory.html
@@ -244,11 +244,7 @@ <h4>messageSerializerFor</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StreamedMessageSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StreamedMessageSerializer.html
index 70ca3920b48..2a72018caee 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StreamedMessageSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StreamedMessageSerializer.html
@@ -208,11 +208,7 @@ <h4>isStreamed</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StrictMessageSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StrictMessageSerializer.html
index 65aafbff6c8..292388e09b0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StrictMessageSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/StrictMessageSerializer.html
@@ -161,11 +161,7 @@ <h3>Methods inherited from interface&nbsp;com.lightbend.lagom.javadsl.api.deser.
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-summary.html
index a82c619f21d..ff2213586f0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-summary.html
@@ -209,11 +209,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api.d
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-tree.html
index e26ad14222a..4134691024a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/deser/package-tree.html
@@ -136,11 +136,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-summary.html
index 0b9fa363be7..37158d8b631 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-summary.html
@@ -279,11 +279,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api</
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-tree.html
index f0dac523ef5..d03bafa0dd6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/package-tree.html
@@ -153,11 +153,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/ServicePrincipal.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/ServicePrincipal.html
index ffe96ed7bda..58fa43913b7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/ServicePrincipal.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/ServicePrincipal.html
@@ -240,11 +240,7 @@ <h4>forServiceNamed</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/UserAgentHeaderFilter.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/UserAgentHeaderFilter.html
index 7f85b388077..fe95267e42d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/UserAgentHeaderFilter.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/UserAgentHeaderFilter.html
@@ -369,11 +369,7 @@ <h4>transformClientResponse</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-summary.html
index 86235b76693..2873ed3b878 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-summary.html
@@ -125,11 +125,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api.s
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-tree.html
index fee6282a0b8..6a908b43d5f 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/security/package-tree.html
@@ -109,11 +109,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/BadRequest.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/BadRequest.html
index a7d37b6f9c8..85bed0aa9a2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/BadRequest.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/BadRequest.html
@@ -291,11 +291,7 @@ <h4>BadRequest</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Forbidden.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Forbidden.html
index 7f75495df96..010b4276a3e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Forbidden.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Forbidden.html
@@ -291,11 +291,7 @@ <h4>Forbidden</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.Composite.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.Composite.html
index 308e3d246ef..8f64f6178b6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.Composite.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.Composite.html
@@ -373,11 +373,7 @@ <h4>transformClientResponse</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.html
index ecf08c21986..b9161714be9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/HeaderFilter.html
@@ -354,11 +354,7 @@ <h4>composite</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageHeader.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageHeader.html
index 767692d7c46..6485f6fd310 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageHeader.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageHeader.html
@@ -315,11 +315,7 @@ <h4>withHeader</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageProtocol.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageProtocol.html
index e448c49a261..95823aa6739 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageProtocol.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/MessageProtocol.html
@@ -523,11 +523,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Method.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Method.html
index cf7ca0575ed..50aaf34e350 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Method.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/Method.html
@@ -388,11 +388,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotAcceptable.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotAcceptable.html
index 806babfe5d2..39d51fee59a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotAcceptable.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotAcceptable.html
@@ -281,11 +281,7 @@ <h4>NotAcceptable</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotFound.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotFound.html
index 2480ec7919e..cf48cabfdd4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotFound.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/NotFound.html
@@ -291,11 +291,7 @@ <h4>NotFound</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PayloadTooLarge.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PayloadTooLarge.html
index f2659909845..0bea6cc880d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PayloadTooLarge.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PayloadTooLarge.html
@@ -291,11 +291,7 @@ <h4>PayloadTooLarge</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PolicyViolation.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PolicyViolation.html
index fe0be44b608..6015aeb409a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PolicyViolation.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/PolicyViolation.html
@@ -291,11 +291,7 @@ <h4>PolicyViolation</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/RequestHeader.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/RequestHeader.html
index 6cd56276d0c..9dff63f0963 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/RequestHeader.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/RequestHeader.html
@@ -600,11 +600,7 @@ <h4>hashCode</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/ResponseHeader.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/ResponseHeader.html
index a581ed86bcd..0fc35f2b1af 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/ResponseHeader.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/ResponseHeader.html
@@ -451,11 +451,7 @@ <h4>hashCode</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportErrorCode.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportErrorCode.html
index 372898c7e06..585c9457e6e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportErrorCode.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportErrorCode.html
@@ -612,11 +612,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportException.html
index 42f206763eb..1a40d523f50 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/TransportException.html
@@ -332,11 +332,7 @@ <h4>toString</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/UnsupportedMediaType.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/UnsupportedMediaType.html
index c52c6c9a454..e29451b11f0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/UnsupportedMediaType.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/UnsupportedMediaType.html
@@ -281,11 +281,7 @@ <h4>UnsupportedMediaType</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-summary.html
index f3ae8ea72ff..dfd8627d28e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-summary.html
@@ -220,11 +220,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.api.t
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-tree.html
index b02e81831a7..858c091f713 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/api/transport/package-tree.html
@@ -137,11 +137,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/TopicProducer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/TopicProducer.html
index 95789c7b1c3..c8b29017535 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/TopicProducer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/TopicProducer.html
@@ -298,11 +298,7 @@ <h4>taggedStreamWithOffset</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html
index c20bff2eec7..d70a6aaad88 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html
@@ -98,10 +98,10 @@ <h2 title="Class KafkaClientModule" class="title">Class KafkaClientModule</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">play.inject.Module</a></li>
+<li>play.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.broker.kafka.KafkaClientModule</li>
@@ -118,7 +118,7 @@ <h2 title="Class KafkaClientModule" class="title">Class KafkaClientModule</h2>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">KafkaClientModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></pre>
+extends play.inject.Module</pre>
 </li>
 </ul>
 </div>
@@ -155,8 +155,8 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Binding.html?is-external=true" title="class or interface in play.inject">Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html#bindings-play.Environment-com.typesafe.config.Config-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment,
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html#bindings-play.Environment-com.typesafe.config.Config-">bindings</a></span>(play.Environment&nbsp;environment,
         com.typesafe.config.Config&nbsp;config)</code>&nbsp;</td>
 </tr>
 </table>
@@ -164,14 +164,14 @@ <h3>Method Summary</h3>
 <li class="blockList"><a name="methods.inherited.from.class.play.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></h3>
-<code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindClass-java.lang.Class-" title="class or interface in play.inject">bindClass</a>, <a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play.inject">bindings</a></code></li>
+<h3>Methods inherited from class&nbsp;play.inject.Module</h3>
+<code>bindClass, bindings</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -218,11 +218,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Binding.html?is-external=true" title="class or interface in play.inject">Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment,
-                                 com.typesafe.config.Config&nbsp;config)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.Environment&nbsp;environment,
+                                             com.typesafe.config.Config&nbsp;config)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindings-play.Environment-com.typesafe.config.Config-" title="class or interface in play.inject">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -250,11 +250,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaMetadataKeys.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaMetadataKeys.html
index 961632d91fd..d2faa22a6fc 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaMetadataKeys.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaMetadataKeys.html
@@ -272,11 +272,7 @@ <h4>TIMESTAMP_TYPE</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaTopicFactory.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaTopicFactory.html
index a7607dd2322..94d49035db6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaTopicFactory.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/KafkaTopicFactory.html
@@ -239,11 +239,7 @@ <h4>create</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-summary.html
index 73a3475ded4..7110b171f5e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-summary.html
@@ -118,11 +118,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.broke
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-tree.html
index 9c469b6d6d7..4f0dab33a84 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/kafka/package-tree.html
@@ -81,9 +81,9 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.broker.kafka.<a href="../../../../../../com/lightbend/lagom/javadsl/broker/kafka/KafkaMetadataKeys.html" title="class in com.lightbend.lagom.javadsl.broker.kafka"><span class="typeNameLink">KafkaMetadataKeys</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.broker.kafka.<a href="../../../../../../com/lightbend/lagom/javadsl/broker/kafka/KafkaTopicFactory.html" title="class in com.lightbend.lagom.javadsl.broker.kafka"><span class="typeNameLink">KafkaTopicFactory</span></a> (implements com.lightbend.lagom.internal.javadsl.api.broker.TopicFactory)</li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
-<li type="circle">play.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.broker.kafka.<a href="../../../../../../com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html" title="class in com.lightbend.lagom.javadsl.broker.kafka"><span class="typeNameLink">KafkaClientModule</span></a></li>
 </ul>
@@ -111,11 +111,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-summary.html
index 928cf2c7f21..cfbc59cd1f4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-summary.html
@@ -108,11 +108,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.broke
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-tree.html
index 5d12a447c5c..00513f75607 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/broker/package-tree.html
@@ -101,11 +101,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakersPanel.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakersPanel.html
index 9e07ae6aff6..0fa42a34aaa 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakersPanel.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakersPanel.html
@@ -190,11 +190,7 @@ <h4>withCircuitBreaker</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html
index f502184134a..036a0266a79 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/CircuitBreakingServiceLocator.html
@@ -288,11 +288,7 @@ <h4>doWithService</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html
index 6e0a909679b..871c9573095 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ConfigurationServiceLocator.html
@@ -287,11 +287,7 @@ <h4>locateAll</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ServiceClientGuiceSupport.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ServiceClientGuiceSupport.html
index 7c228a381a7..6fdf0ec74f8 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ServiceClientGuiceSupport.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/ServiceClientGuiceSupport.html
@@ -207,11 +207,7 @@ <h4>bindServiceInfo</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/LagomClientFactory.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/LagomClientFactory.html
index 8d9ac60bcd3..ceff14c2b72 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/LagomClientFactory.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/LagomClientFactory.html
@@ -411,11 +411,7 @@ <h4>create</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-summary.html
index 00e9392a739..79a61be8515 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-summary.html
@@ -108,11 +108,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.clien
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-tree.html
index 4bfeba4f8e3..87f3b5e50a0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/integration/package-tree.html
@@ -101,11 +101,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-summary.html
index 4ac931a2a33..cc53debd698 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-summary.html
@@ -138,11 +138,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.clien
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-tree.html
index 056617cacf9..0d7b0bde7c7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/client/package-tree.html
@@ -110,11 +110,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html
index 34e64d53dc2..22b1600b2a3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html
@@ -98,7 +98,7 @@ <h2 title="Class ActorSystemModule" class="title">Class ActorSystemModule</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.cluster.testkit.ActorSystemModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class ActorSystemModule" class="title">Class ActorSystemModule</h2>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">ActorSystemModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 </li>
 </ul>
 </div>
@@ -150,16 +150,16 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -206,11 +206,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -238,11 +238,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-summary.html
index 48d5e52332a..201318c7dbe 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-summary.html
@@ -106,11 +106,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.clust
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-tree.html
index 50388b1dfa4..c210b305455 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/cluster/testkit/package-tree.html
@@ -79,7 +79,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.cluster.testkit.<a href="../../../../../../com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html" title="class in com.lightbend.lagom.javadsl.cluster.testkit"><span class="typeNameLink">ActorSystemModule</span></a></li>
 </ul>
@@ -105,11 +105,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/ImmutableStyle.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/ImmutableStyle.html
index d4b44878c73..6f86d18ceb7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/ImmutableStyle.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/ImmutableStyle.html
@@ -116,11 +116,7 @@ <h2 title="Annotation Type ImmutableStyle" class="title">Annotation Type Immutab
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-summary.html
index 6ce38e69ea7..2f412cc5530 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-summary.html
@@ -106,11 +106,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.immut
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-tree.html
index 09cc6301ddc..730f676d8fd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/immutable/package-tree.html
@@ -97,11 +97,7 @@ <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html
index 8353789c59f..5bed564b928 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html
@@ -149,7 +149,7 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html#JacksonExceptionSerializer-play.Environment-">JacksonExceptionSerializer</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html#JacksonExceptionSerializer-play.Environment-">JacksonExceptionSerializer</a></span>(play.Environment&nbsp;environment)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -208,7 +208,7 @@ <h3>Constructor Detail</h3>
 <li class="blockList">
 <h4>JacksonExceptionSerializer</h4>
 <pre>@Inject
-public&nbsp;JacksonExceptionSerializer(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment)</pre>
+public&nbsp;JacksonExceptionSerializer(play.Environment&nbsp;environment)</pre>
 </li>
 </ul>
 </li>
@@ -292,11 +292,7 @@ <h4>deserialize</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonModule.html
index 77e97c8b3b0..b2ddb68d0e0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonModule.html
@@ -98,7 +98,7 @@ <h2 title="Class JacksonModule" class="title">Class JacksonModule</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.jackson.JacksonModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class JacksonModule" class="title">Class JacksonModule</h2>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">JacksonModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 <div class="block">Module that provides the default Jackson serializer factory.</div>
 </li>
 </ul>
@@ -151,16 +151,16 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -207,11 +207,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -239,11 +239,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonSerializerFactory.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonSerializerFactory.html
index ce60330ff03..00a4d0bac9d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonSerializerFactory.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/JacksonSerializerFactory.html
@@ -270,11 +270,7 @@ <h4>messageSerializerFor</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-summary.html
index e28a26d0e07..9fd57f455b2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-summary.html
@@ -120,11 +120,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.jacks
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-tree.html
index d12b66c2e51..5821642864a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/jackson/package-tree.html
@@ -81,7 +81,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.jackson.<a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonExceptionSerializer.html" title="class in com.lightbend.lagom.javadsl.jackson"><span class="typeNameLink">JacksonExceptionSerializer</span></a> (implements com.lightbend.lagom.javadsl.api.deser.<a href="../../../../../com/lightbend/lagom/javadsl/api/deser/ExceptionSerializer.html" title="interface in com.lightbend.lagom.javadsl.api.deser">ExceptionSerializer</a>)</li>
 <li type="circle">com.lightbend.lagom.javadsl.jackson.<a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonSerializerFactory.html" title="class in com.lightbend.lagom.javadsl.jackson"><span class="typeNameLink">JacksonSerializerFactory</span></a> (implements com.lightbend.lagom.javadsl.api.deser.<a href="../../../../../com/lightbend/lagom/javadsl/api/deser/SerializerFactory.html" title="interface in com.lightbend.lagom.javadsl.api.deser">SerializerFactory</a>)</li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.jackson.<a href="../../../../../com/lightbend/lagom/javadsl/jackson/JacksonModule.html" title="class in com.lightbend.lagom.javadsl.jackson"><span class="typeNameLink">JacksonModule</span></a></li>
 </ul>
@@ -107,11 +107,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEvent.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEvent.html
index 8581bc55939..d9089180c2c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEvent.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEvent.html
@@ -172,11 +172,7 @@ <h4>aggregateTag</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventShards.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventShards.html
index 87a9a013395..a7b4a9f8848 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventShards.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventShards.html
@@ -360,11 +360,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag$.html
index 207cf2e9858..bdae0acb89c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag$.html
@@ -408,11 +408,7 @@ <h4>shardTag</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag.html
index 0e6deb1ee4b..6f035978220 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTag.html
@@ -465,11 +465,7 @@ <h4>hashCode</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTagger.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTagger.html
index 3ac3f5925c0..a27b8d80f15 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTagger.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/AggregateEventTagger.html
@@ -177,11 +177,7 @@ <h4>eventType</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope$.html
index 558f0593e9e..aa5d468b34a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope$.html
@@ -253,11 +253,7 @@ <h4>CommandEnvelope$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope.html
index 53ef9a8cf8c..ce1066a3d79 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/CommandEnvelope.html
@@ -342,11 +342,7 @@ <h4>payload</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.NoOffset.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.NoOffset.html
index 2b75e6a02c1..de49f08e0fe 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.NoOffset.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.NoOffset.html
@@ -270,11 +270,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.Sequence.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.Sequence.html
index 8693fd02d49..976602320ea 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.Sequence.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.Sequence.html
@@ -340,11 +340,7 @@ <h4>compareTo</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.TimeBasedUUID.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.TimeBasedUUID.html
index d0bfc35bb95..6b3d2d3730c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.TimeBasedUUID.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.TimeBasedUUID.html
@@ -340,11 +340,7 @@ <h4>compareTo</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.html
index 26745414a25..e2fad9e6e67 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/Offset.html
@@ -299,11 +299,7 @@ <h4>timeBasedUUID</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistenceModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistenceModule.html
index d1030cecd9f..1e0c2b24fd7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistenceModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistenceModule.html
@@ -98,7 +98,7 @@ <h2 title="Class PersistenceModule" class="title">Class PersistenceModule</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.persistence.PersistenceModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class PersistenceModule" class="title">Class PersistenceModule</h2>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">PersistenceModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 <div class="block">Guice module for the Persistence API.</div>
 </li>
 </ul>
@@ -151,16 +151,16 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/persistence/PersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/persistence/PersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -207,11 +207,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -239,11 +239,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity$.html
index ab9c9423ee6..be79c5253fe 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity$.html
@@ -225,11 +225,7 @@ <h4>PersistentEntity$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior$.html
index 0238a8d2a56..60f06ec1c23 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior$.html
@@ -218,11 +218,7 @@ <h4>Behavior$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior.html
index 50886e5e854..a74968a36c3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Behavior.html
@@ -318,11 +318,7 @@ <h4>builder</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.BehaviorBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.BehaviorBuilder.html
index ef3e94f06b1..38a3b7accb4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.BehaviorBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.BehaviorBuilder.html
@@ -401,11 +401,7 @@ <h4>setState</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.CommandContext.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.CommandContext.html
index f7f7204f3b8..98a29be52f3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.CommandContext.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.CommandContext.html
@@ -374,11 +374,7 @@ <h4>thenPersistAll</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException$.html
index 4c4ceae2f62..9989f320e66 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException$.html
@@ -257,11 +257,7 @@ <h4>InvalidCommandException$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException.html
index b1ba903cec7..03217b2f9be 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.InvalidCommandException.html
@@ -282,11 +282,7 @@ <h4>message</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Persist.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Persist.html
index 9839b79e866..10f7eee8cdd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Persist.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.Persist.html
@@ -197,11 +197,7 @@ <h4>Persist</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll$.html
index 57f8fda7614..5ed19fdf6d0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll$.html
@@ -199,11 +199,7 @@ <h4>PersistAll$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll.html
index f3a1d3b69f5..0deaee8aca9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistAll.html
@@ -268,11 +268,7 @@ <h4>afterPersist</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException$.html
index e3b292680dd..bda34f47739 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException$.html
@@ -257,11 +257,7 @@ <h4>PersistException$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException.html
index f9aebfc284b..22a5066709c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistException.html
@@ -282,11 +282,7 @@ <h4>message</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone$.html
index 4efb6e06fe1..e6733114af6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone$.html
@@ -199,11 +199,7 @@ <h4>PersistNone$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone.html
index d474820b1fa..6dbefeb0424 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistNone.html
@@ -257,11 +257,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne$.html
index a143146d9d8..e7a7fff5756 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne$.html
@@ -199,11 +199,7 @@ <h4>PersistOne$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne.html
index 354b58c1490..2046b73cee1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.PersistOne.html
@@ -270,11 +270,7 @@ <h4>afterPersist</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReadOnlyCommandContext.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReadOnlyCommandContext.html
index 22fd4976f9e..02f58448238 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReadOnlyCommandContext.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReadOnlyCommandContext.html
@@ -269,11 +269,7 @@ <h4>reply</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReplyType.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReplyType.html
index 0b7d7e314f6..a17c2205dcd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReplyType.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.ReplyType.html
@@ -126,11 +126,7 @@ <h2 title="Interface PersistentEntity.ReplyType" class="title">Interface Persist
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException$.html
index 78b2e6dded3..a4590b3bfd2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException$.html
@@ -257,11 +257,7 @@ <h4>UnhandledCommandException$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException.html
index 8a1535380af..6337a20a769 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.UnhandledCommandException.html
@@ -282,11 +282,7 @@ <h4>message</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.html
index 490bc3811fc..991caec68d7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntity.html
@@ -532,11 +532,7 @@ <h4>newBehaviorBuilder</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRef.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRef.html
index be4d2a61f8b..dd661faf22a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRef.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRef.html
@@ -361,11 +361,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRegistry.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRegistry.html
index 8b78ff487ed..67e6f07a352 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRegistry.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/PersistentEntityRegistry.html
@@ -288,11 +288,7 @@ <h4>register</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSide.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSide.html
index 4bf38ef87ba..b8fa62006b2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSide.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSide.html
@@ -185,11 +185,7 @@ <h4>register</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.ReadSideHandler.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.ReadSideHandler.html
index f06ce3c3853..fb1bdc22066 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.ReadSideHandler.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.ReadSideHandler.html
@@ -293,11 +293,7 @@ <h4>handle</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.html
index 565c0528332..d0987375099 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/ReadSideProcessor.html
@@ -308,11 +308,7 @@ <h4>readSideName</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraConfig.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraConfig.html
index e3b50a110a2..42ba615cb97 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraConfig.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraConfig.html
@@ -178,11 +178,7 @@ <h4>uris</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraContactPoint.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraContactPoint.html
index 9a9bfda9b3d..8aeab406e52 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraContactPoint.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraContactPoint.html
@@ -318,11 +318,7 @@ <h4>of</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceGuiceModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceGuiceModule.html
index dd960c9d200..e4fdd549b22 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceGuiceModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceGuiceModule.html
@@ -244,11 +244,7 @@ <h4>configure</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule$.html
index d2cc4c523b5..8fcc34501d6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule$.html
@@ -225,11 +225,7 @@ <h4>CassandraPersistenceModule$</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.InitServiceLocatorHolder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.InitServiceLocatorHolder.html
index b176bf1057b..00601de0cee 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.InitServiceLocatorHolder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.InitServiceLocatorHolder.html
@@ -132,7 +132,7 @@ <h3>Constructor Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.InitServiceLocatorHolder.html#InitServiceLocatorHolder-akka.actor.ActorSystem-play.api.inject.Injector-">InitServiceLocatorHolder</a></span>(akka.actor.ActorSystem&nbsp;system,
-                        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Injector.html?is-external=true" title="class or interface in play">play.api.inject.Injector</a>&nbsp;injector)</code>&nbsp;</td>
+                        play.api.inject.Injector&nbsp;injector)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -182,7 +182,7 @@ <h3>Constructor Detail</h3>
 <li class="blockList">
 <h4>InitServiceLocatorHolder</h4>
 <pre>public&nbsp;InitServiceLocatorHolder(akka.actor.ActorSystem&nbsp;system,
-                                <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Injector.html?is-external=true" title="class or interface in play">play.api.inject.Injector</a>&nbsp;injector)</pre>
+                                play.api.inject.Injector&nbsp;injector)</pre>
 </li>
 </ul>
 </li>
@@ -226,11 +226,7 @@ <h4>init</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html
index c14af7e810c..03d3f432fe1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html
@@ -98,7 +98,7 @@ <h2 title="Class CassandraPersistenceModule" class="title">Class CassandraPersis
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.persistence.cassandra.CassandraPersistenceModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class CassandraPersistenceModule" class="title">Class CassandraPersis
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">CassandraPersistenceModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 <div class="block">Guice module for the Persistence API.</div>
 </li>
 </ul>
@@ -170,32 +170,32 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;</code></td>
+<td class="colFirst"><code>static &lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#bind-java.lang.Class-">bind</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;</code></td>
+<td class="colFirst"><code>static &lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#bind-scala.reflect.ClassTag-">bind</a></span>(scala.reflect.ClassTag&lt;T&gt;&nbsp;evidence$1)</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code>static scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#seq-play.api.inject.Binding...-">seq</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;...&nbsp;bindings)</code>&nbsp;</td>
+<td class="colFirst"><code>static scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#seq-play.api.inject.Binding...-">seq</a></span>(play.api.inject.Binding&lt;?&gt;...&nbsp;bindings)</code>&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code>static scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#seq-scala.collection.Seq-">seq</a></span>(scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings)</code>&nbsp;</td>
+<td class="colFirst"><code>static scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html#seq-scala.collection.Seq-">seq</a></span>(scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -242,7 +242,7 @@ <h3>Method Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>bind</h4>
-<pre>public static final&nbsp;&lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
+<pre>public static final&nbsp;&lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
 </li>
 </ul>
 <a name="bind-scala.reflect.ClassTag-">
@@ -251,7 +251,7 @@ <h4>bind</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>bind</h4>
-<pre>public static final&nbsp;&lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;&nbsp;bind(scala.reflect.ClassTag&lt;T&gt;&nbsp;evidence$1)</pre>
+<pre>public static final&nbsp;&lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;&nbsp;bind(scala.reflect.ClassTag&lt;T&gt;&nbsp;evidence$1)</pre>
 </li>
 </ul>
 <a name="seq-scala.collection.Seq-">
@@ -260,7 +260,7 @@ <h4>bind</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>seq</h4>
-<pre>public static final&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;seq(scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings)</pre>
+<pre>public static final&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;seq(scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings)</pre>
 </li>
 </ul>
 <a name="seq-play.api.inject.Binding...-">
@@ -269,7 +269,7 @@ <h4>seq</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>seq</h4>
-<pre>public static final&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;seq(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;...&nbsp;bindings)</pre>
+<pre>public static final&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;seq(play.api.inject.Binding&lt;?&gt;...&nbsp;bindings)</pre>
 </li>
 </ul>
 <a name="bindings-play.api.Environment-play.api.Configuration-">
@@ -278,11 +278,11 @@ <h4>seq</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -310,11 +310,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.ReadSideHandlerBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.ReadSideHandlerBuilder.html
index bc3aefc2117..71f0da08758 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.ReadSideHandlerBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.ReadSideHandlerBuilder.html
@@ -282,11 +282,7 @@ <h4>build</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.html
index 3c317d3ba07..831434bd32d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSide.html
@@ -288,11 +288,7 @@ <h4>completedStatements</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers$.html
index 85cb3231246..0af2a87f84e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers$.html
@@ -257,11 +257,7 @@ <h4>EventHandlers$</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers.html
index 0d746121958..85bdb9a027f 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers.html
@@ -325,11 +325,7 @@ <h4>handlers</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlersBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlersBuilder.html
index cdf74bf3c99..1037a67e6b0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlersBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlersBuilder.html
@@ -248,11 +248,7 @@ <h4>setEventHandler</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.html
index e253e453363..297a14563a3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.html
@@ -400,11 +400,7 @@ <h4>prepare</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraSession.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraSession.html
index 85ed20e971a..ecd87eb67ab 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraSession.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/CassandraSession.html
@@ -626,11 +626,7 @@ <h4>underlying</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-summary.html
index 77ab6b8c90f..bf51b993351 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-summary.html
@@ -169,11 +169,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-tree.html
index 75132478f0a..6cedde4a9fd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/package-tree.html
@@ -96,7 +96,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlers.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra"><span class="typeNameLink">CassandraReadSideProcessor.EventHandlers</span></a> (implements scala.Product, scala.Serializable)</li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraReadSideProcessor.EventHandlersBuilder.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra"><span class="typeNameLink">CassandraReadSideProcessor.EventHandlersBuilder</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraSession.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra"><span class="typeNameLink">CassandraSession</span></a></li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra"><span class="typeNameLink">CassandraPersistenceModule</span></a></li>
 </ul>
@@ -128,11 +128,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html
index 793414adc4a..0f089e680c2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html
@@ -284,11 +284,7 @@ <h4>persistenceConfig</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html
index 209dc075cb7..7a3efa4662a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html
@@ -263,11 +263,7 @@ <h4>awaitPersistenceInit</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-summary.html
index 15eab6ac0d0..eed83cd5fc3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-summary.html
@@ -114,11 +114,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-tree.html
index af0fad9572d..e61b85073fe 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/cassandra/testkit/package-tree.html
@@ -102,11 +102,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html
index eb44c0c402e..0a043460605 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html
@@ -132,9 +132,9 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html#GuiceSlickProvider-play.api.db.DBApi-akka.actor.ActorSystem-play.api.inject.ApplicationLifecycle-scala.concurrent.ExecutionContext-">GuiceSlickProvider</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.db.DBApi.html?is-external=true" title="class or interface in play">play.api.db.DBApi</a>&nbsp;dbApi,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html#GuiceSlickProvider-play.api.db.DBApi-akka.actor.ActorSystem-play.api.inject.ApplicationLifecycle-scala.concurrent.ExecutionContext-">GuiceSlickProvider</a></span>(play.api.db.DBApi&nbsp;dbApi,
                   akka.actor.ActorSystem&nbsp;actorSystem,
-                  <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.ApplicationLifecycle.html?is-external=true" title="class or interface in play">play.api.inject.ApplicationLifecycle</a>&nbsp;applicationLifecycle,
+                  play.api.inject.ApplicationLifecycle&nbsp;applicationLifecycle,
                   scala.concurrent.ExecutionContext&nbsp;ec)</code>&nbsp;</td>
 </tr>
 </table>
@@ -184,9 +184,9 @@ <h3>Constructor Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>GuiceSlickProvider</h4>
-<pre>public&nbsp;GuiceSlickProvider(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.db.DBApi.html?is-external=true" title="class or interface in play">play.api.db.DBApi</a>&nbsp;dbApi,
+<pre>public&nbsp;GuiceSlickProvider(play.api.db.DBApi&nbsp;dbApi,
                           akka.actor.ActorSystem&nbsp;actorSystem,
-                          <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.ApplicationLifecycle.html?is-external=true" title="class or interface in play">play.api.inject.ApplicationLifecycle</a>&nbsp;applicationLifecycle,
+                          play.api.inject.ApplicationLifecycle&nbsp;applicationLifecycle,
                           scala.concurrent.ExecutionContext&nbsp;ec)</pre>
 </li>
 </ul>
@@ -235,11 +235,7 @@ <h4>get</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html
index 88f75507c32..996e20e9bd3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html
@@ -98,7 +98,7 @@ <h2 title="Class JdbcPersistenceModule" class="title">Class JdbcPersistenceModul
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.persistence.jdbc.JdbcPersistenceModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class JdbcPersistenceModule" class="title">Class JdbcPersistenceModul
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">JdbcPersistenceModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 </li>
 </ul>
 </div>
@@ -150,16 +150,16 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -206,11 +206,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -238,11 +238,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionBiConsumer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionBiConsumer.html
index 1109b5bcc50..f6cbdd2a47b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionBiConsumer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionBiConsumer.html
@@ -195,11 +195,7 @@ <h4>accept</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionConsumer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionConsumer.html
index f9ff6a84fb4..a9db0a40d30 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionConsumer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionConsumer.html
@@ -190,11 +190,7 @@ <h4>accept</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionTriConsumer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionTriConsumer.html
index 33dce653bf9..005ca169bf3 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionTriConsumer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ConnectionTriConsumer.html
@@ -198,11 +198,7 @@ <h4>accept</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ReadSideHandlerBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ReadSideHandlerBuilder.html
index 6ef3220127b..b25ed459958 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ReadSideHandlerBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.ReadSideHandlerBuilder.html
@@ -282,11 +282,7 @@ <h4>build</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.html
index d1a7b04f47b..8eed950fcae 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcReadSide.html
@@ -226,11 +226,7 @@ <h4>builder</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.ConnectionFunction.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.ConnectionFunction.html
index 6070e34ee64..223a66d49b6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.ConnectionFunction.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.ConnectionFunction.html
@@ -190,11 +190,7 @@ <h4>apply</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.html
index ab2e5221c25..b844439d8d1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/JdbcSession.html
@@ -226,11 +226,7 @@ <h4>withTransaction</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-summary.html
index 2ef3c59959a..11935ba8c6a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-summary.html
@@ -161,11 +161,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-tree.html
index 8709050e01e..e7d2730dddf 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/package-tree.html
@@ -80,7 +80,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jdbc.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/GuiceSlickProvider.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc"><span class="typeNameLink">GuiceSlickProvider</span></a> (implements javax.inject.Provider&lt;T&gt;)</li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jdbc.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc"><span class="typeNameLink">JdbcPersistenceModule</span></a></li>
 </ul>
@@ -116,11 +116,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html
index 02ae5199ecb..3da85edc047 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html
@@ -245,11 +245,7 @@ <h4>TestUtil$</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html
index ace578b0afb..2ab36602624 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html
@@ -245,11 +245,7 @@ <h4>awaitPersistenceInit</h4>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-summary.html
index 9c62cdca882..a50b79cd5fb 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-summary.html
@@ -114,11 +114,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-tree.html
index 83c24a6e506..65bff7fd067 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jdbc/testkit/package-tree.html
@@ -102,11 +102,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li><a href="../../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html
index f4bdabf9cac..e7dee6df23b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html
@@ -98,10 +98,10 @@ <h2 title="Class JpaPersistenceModule" class="title">Class JpaPersistenceModule<
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">play.inject.Module</a></li>
+<li>play.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.persistence.jpa.JpaPersistenceModule</li>
@@ -118,7 +118,7 @@ <h2 title="Class JpaPersistenceModule" class="title">Class JpaPersistenceModule<
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">JpaPersistenceModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></pre>
+extends play.inject.Module</pre>
 </li>
 </ul>
 </div>
@@ -155,8 +155,8 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Binding.html?is-external=true" title="class or interface in play.inject">Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html#bindings-play.Environment-com.typesafe.config.Config-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment,
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html#bindings-play.Environment-com.typesafe.config.Config-">bindings</a></span>(play.Environment&nbsp;environment,
         com.typesafe.config.Config&nbsp;config)</code>&nbsp;</td>
 </tr>
 </table>
@@ -164,14 +164,14 @@ <h3>Method Summary</h3>
 <li class="blockList"><a name="methods.inherited.from.class.play.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></h3>
-<code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindClass-java.lang.Class-" title="class or interface in play.inject">bindClass</a>, <a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play.inject">bindings</a></code></li>
+<h3>Methods inherited from class&nbsp;play.inject.Module</h3>
+<code>bindClass, bindings</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -218,11 +218,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Binding.html?is-external=true" title="class or interface in play.inject">Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/Environment.html?is-external=true" title="class or interface in play">Environment</a>&nbsp;environment,
-                                 com.typesafe.config.Config&nbsp;config)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.Environment&nbsp;environment,
+                                             com.typesafe.config.Config&nbsp;config)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true#bindings-play.Environment-com.typesafe.config.Config-" title="class or interface in play.inject">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject">Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -250,11 +250,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.ReadSideHandlerBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.ReadSideHandlerBuilder.html
index 64e6fc3ef51..466bd5b3ef1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.ReadSideHandlerBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.ReadSideHandlerBuilder.html
@@ -255,11 +255,7 @@ <h4>build</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.html
index b10f5b97402..44024e9e9d7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaReadSide.html
@@ -212,11 +212,7 @@ <h4>builder</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaSession.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaSession.html
index d1018a7dbac..8bc98637609 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaSession.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/JpaSession.html
@@ -188,11 +188,7 @@ <h4>withTransaction</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-summary.html
index e782ed050d8..33d00ef894a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-summary.html
@@ -135,11 +135,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-tree.html
index 40741080b4d..d2d7c1172c2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/jpa/package-tree.html
@@ -79,9 +79,9 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
-<li type="circle">play.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jpa.<a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.jpa"><span class="typeNameLink">JpaPersistenceModule</span></a></li>
 </ul>
@@ -115,11 +115,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-summary.html
index 7cb53d5243c..eb84ae6a778 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-summary.html
@@ -274,11 +274,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-tree.html
index ccd86b6ee25..a37ad734172 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/package-tree.html
@@ -100,7 +100,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.<a href="../../../../../com/lightbend/lagom/javadsl/persistence/AggregateEventTag.html" title="class in com.lightbend.lagom.javadsl.persistence"><span class="typeNameLink">AggregateEventTag</span></a>&lt;Event&gt; (implements com.lightbend.lagom.javadsl.persistence.<a href="../../../../../com/lightbend/lagom/javadsl/persistence/AggregateEventTagger.html" title="interface in com.lightbend.lagom.javadsl.persistence">AggregateEventTagger</a>&lt;Event&gt;)</li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.<a href="../../../../../com/lightbend/lagom/javadsl/persistence/AggregateEventTag$.html" title="class in com.lightbend.lagom.javadsl.persistence"><span class="typeNameLink">AggregateEventTag$</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.<a href="../../../../../com/lightbend/lagom/javadsl/persistence/CommandEnvelope.html" title="class in com.lightbend.lagom.javadsl.persistence"><span class="typeNameLink">CommandEnvelope</span></a> (implements scala.Product, scala.Serializable)</li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.<a href="../../../../../com/lightbend/lagom/javadsl/persistence/PersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence"><span class="typeNameLink">PersistenceModule</span></a></li>
 </ul>
@@ -182,11 +182,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html
index 473a33e5c86..ef1bf73fdfd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html
@@ -99,7 +99,7 @@ <h2 title="Interface AbstractTestUtil" class="title">Interface AbstractTestUtil<
 <li class="blockList">
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">TestUtil$</a>, <a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">TestUtil$</a></dd>
+<dd><a href="../../../../../../com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">TestUtil$</a>, <a href="../../../../../../com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">TestUtil$</a></dd>
 </dl>
 <hr>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -196,11 +196,7 @@ <h4>clusterConfig</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AwaitPersistenceInit.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AwaitPersistenceInit.html
index 09a32fc47ba..0a06e52f66c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AwaitPersistenceInit.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/AwaitPersistenceInit.html
@@ -300,11 +300,7 @@ <h4>AwaitPersistenceInit</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-summary.html
index ecc7bf4780e..90f86d98763 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-summary.html
@@ -125,11 +125,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.persi
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-tree.html
index 392e4a9632e..9da2d9e1d67 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/persistence/testkit/package-tree.html
@@ -109,11 +109,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubModule.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubModule.html
index 2ff63c2c237..3645fa471e7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubModule.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubModule.html
@@ -98,7 +98,7 @@ <h2 title="Class PubSubModule" class="title">Class PubSubModule</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></li>
+<li>play.api.inject.Module</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.pubsub.PubSubModule</li>
@@ -113,7 +113,7 @@ <h2 title="Class PubSubModule" class="title">Class PubSubModule</h2>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">PubSubModule</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></pre>
+extends play.api.inject.Module</pre>
 <div class="block">Guice module for the PubSub API.</div>
 </li>
 </ul>
@@ -151,16 +151,16 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/pubsub/PubSubModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-        <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</code>&nbsp;</td>
+<td class="colFirst"><code>scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/pubsub/PubSubModule.html#bindings-play.api.Environment-play.api.Configuration-">bindings</a></span>(play.api.Environment&nbsp;environment,
+        play.api.Configuration&nbsp;configuration)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.play.api.inject.Module">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">Module</a></h3>
+<h3>Methods inherited from class&nbsp;play.api.inject.Module</h3>
 <code>bind, bind, seq, seq</code></li>
 </ul>
 <ul class="blockList">
@@ -207,11 +207,11 @@ <h3>Method Detail</h3>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bindings</h4>
-<pre>public&nbsp;scala.collection.Seq&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Binding.html?is-external=true" title="class or interface in play">play.api.inject.Binding</a>&lt;?&gt;&gt;&nbsp;bindings(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.Environment.html?is-external=true" title="class or interface in play">play.api.Environment</a>&nbsp;environment,
-                                                                 <a href="https://www.playframework.com/documentation/latest/api/java/play/api.Configuration.html?is-external=true" title="class or interface in play">play.api.Configuration</a>&nbsp;configuration)</pre>
+<pre>public&nbsp;scala.collection.Seq&lt;play.api.inject.Binding&lt;?&gt;&gt;&nbsp;bindings(play.api.Environment&nbsp;environment,
+                                                                 play.api.Configuration&nbsp;configuration)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true#bindings-play.api.Environment-play.api.Configuration-" title="class or interface in play">bindings</a></code>&nbsp;in class&nbsp;<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play">play.api.inject.Module</a></code></dd>
+<dd><code>bindings</code>&nbsp;in class&nbsp;<code>play.api.inject.Module</code></dd>
 </dl>
 </li>
 </ul>
@@ -239,11 +239,7 @@ <h4>bindings</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRef.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRef.html
index 7119e9b1fdb..af1a019db21 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRef.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRef.html
@@ -350,11 +350,7 @@ <h4>topic</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRegistry.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRegistry.html
index 87b93806518..f03b9ecaf7a 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRegistry.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/PubSubRegistry.html
@@ -175,11 +175,7 @@ <h4>refFor</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId$.html
index 58e55842692..2361af2377e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId$.html
@@ -270,11 +270,7 @@ <h4>of</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId.html
index fe286bd3ecc..bc9f42fc5d4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/TopicId.html
@@ -364,11 +364,7 @@ <h4>name</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-summary.html
index 02127221783..df6addde6d0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-summary.html
@@ -140,11 +140,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.pubsu
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-tree.html
index eab70d245c6..34a2d947e81 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/pubsub/package-tree.html
@@ -79,7 +79,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.pubsub.<a href="../../../../../com/lightbend/lagom/javadsl/pubsub/PubSubModule.html" title="class in com.lightbend.lagom.javadsl.pubsub"><span class="typeNameLink">PubSubModule</span></a></li>
 </ul>
@@ -112,11 +112,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter$.html
index cc179c6e0d1..4c23eb16415 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter$.html
@@ -173,8 +173,8 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter$.html#wireRouters-play.api.inject.Injector-java.util.List-">wireRouters</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Injector.html?is-external=true" title="class or interface in play">play.api.inject.Injector</a>&nbsp;injector,
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.api.routing.Router&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter$.html#wireRouters-play.api.inject.Injector-java.util.List-">wireRouters</a></span>(play.api.inject.Injector&nbsp;injector,
            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&gt;&nbsp;additionalRouters)</code>&nbsp;</td>
 </tr>
 </table>
@@ -251,7 +251,7 @@ <h4>appendPrefix</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>wireRouters</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;&nbsp;wireRouters(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Injector.html?is-external=true" title="class or interface in play">play.api.inject.Injector</a>&nbsp;injector,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;play.api.routing.Router&gt;&nbsp;wireRouters(play.api.inject.Injector&nbsp;injector,
                                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&gt;&nbsp;additionalRouters)</pre>
 </li>
 </ul>
@@ -279,11 +279,7 @@ <h4>wireRouters</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter.html
index 2086477ed81..3a733cd7bf9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/AdditionalRouter.html
@@ -187,11 +187,7 @@ <h4>withPrefix</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased$.html
index d9fdef1dbea..478fe3e0202 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased$.html
@@ -234,11 +234,7 @@ <h4>ClassBased$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased.html
index 19300d13f61..8bbba2766be 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ClassBased.html
@@ -91,7 +91,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">com.lightbend.lagom.javadsl.server</div>
-<h2 title="Class ClassBased" class="title">Class ClassBased&lt;R extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;</h2>
+<h2 title="Class ClassBased" class="title">Class ClassBased&lt;R extends play.api.routing.Router&gt;</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -111,7 +111,7 @@ <h2 title="Class ClassBased" class="title">Class ClassBased&lt;R extends <a href
 </dl>
 <hr>
 <br>
-<pre>public final class <span class="typeNameLabel">ClassBased&lt;R extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;</span>
+<pre>public final class <span class="typeNameLabel">ClassBased&lt;R extends play.api.routing.Router&gt;</span>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>, scala.Product, scala.Serializable</pre>
 <dl>
@@ -369,11 +369,7 @@ <h4>withPrefix</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/HeaderServiceCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/HeaderServiceCall.html
index 8b4ec6e0572..323ec72af44 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/HeaderServiceCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/HeaderServiceCall.html
@@ -369,11 +369,7 @@ <h4>composeAsync</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased$.html
index 87ce219c8c2..f77c4d934d6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased$.html
@@ -92,7 +92,7 @@ <h2 title="Class InstanceBased$" class="title">Class InstanceBased$</h2>
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></li>
 <li>
 <ul class="inheritance">
-<li>scala.runtime.AbstractFunction2&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;</li>
+<li>scala.runtime.AbstractFunction2&lt;play.api.routing.Router,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;</li>
 <li>
 <ul class="inheritance">
 <li>com.lightbend.lagom.javadsl.server.InstanceBased$</li>
@@ -106,12 +106,12 @@ <h2 title="Class InstanceBased$" class="title">Class InstanceBased$</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, scala.Function2&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;</dd>
+<dd><a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, scala.Function2&lt;play.api.routing.Router,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;</dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">InstanceBased$</span>
-extends scala.runtime.AbstractFunction2&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;
+extends scala.runtime.AbstractFunction2&lt;play.api.routing.Router,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt;
 implements scala.Serializable</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -253,11 +253,7 @@ <h4>InstanceBased$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased.html
index 5c74b1369dc..bc4e1c20c84 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/InstanceBased.html
@@ -136,10 +136,10 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#InstanceBased-play.api.routing.Router-">InstanceBased</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;classType)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#InstanceBased-play.api.routing.Router-">InstanceBased</a></span>(play.api.routing.Router&nbsp;classType)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#InstanceBased-play.api.routing.Router-scala.Option-">InstanceBased</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;router,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#InstanceBased-play.api.routing.Router-scala.Option-">InstanceBased</a></span>(play.api.routing.Router&nbsp;router,
              scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;prefix)</code>&nbsp;</td>
 </tr>
 </table>
@@ -186,7 +186,7 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#productPrefix--">productPrefix</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a></code></td>
+<td class="colFirst"><code>play.api.routing.Router</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/InstanceBased.html#router--">router</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
@@ -235,7 +235,7 @@ <h3>Constructor Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>InstanceBased</h4>
-<pre>public&nbsp;InstanceBased(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;router,
+<pre>public&nbsp;InstanceBased(play.api.routing.Router&nbsp;router,
                      scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;prefix)</pre>
 </li>
 </ul>
@@ -245,7 +245,7 @@ <h4>InstanceBased</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>InstanceBased</h4>
-<pre>public&nbsp;InstanceBased(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;classType)</pre>
+<pre>public&nbsp;InstanceBased(play.api.routing.Router&nbsp;classType)</pre>
 </li>
 </ul>
 </li>
@@ -316,7 +316,7 @@ <h4>productPrefix</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>router</h4>
-<pre>public&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;router()</pre>
+<pre>public&nbsp;play.api.routing.Router&nbsp;router()</pre>
 </li>
 </ul>
 <a name="prefix--">
@@ -369,11 +369,7 @@ <h4>withPrefix</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/LagomServiceRouter.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/LagomServiceRouter.html
index 6060300f7b4..a72d936a816 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/LagomServiceRouter.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/LagomServiceRouter.html
@@ -93,12 +93,12 @@ <h2 title="Interface LagomServiceRouter" class="title">Interface LagomServiceRou
 <li class="blockList">
 <dl>
 <dt>All Superinterfaces:</dt>
-<dd><a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a></dd>
+<dd>play.api.routing.Router</dd>
 </dl>
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">LagomServiceRouter</span>
-extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a></pre>
+extends play.api.routing.Router</pre>
 <div class="block">A Lagom service router.
 
  This interface doesn't add anything, except that it makes the router created by the LagomServer
@@ -127,8 +127,8 @@ <h3>Nested Class Summary</h3>
 <li class="blockList"><a name="nested.classes.inherited.from.class.play.api.routing.Router">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;play.api.routing.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">Router</a></h3>
-<code><a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.Attrs$.html?is-external=true" title="class or interface in play">play.api.routing.Router.Attrs$</a>, <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.RequestImplicits$.html?is-external=true" title="class or interface in play">play.api.routing.Router.RequestImplicits$</a></code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;play.api.routing.Router</h3>
+<code>play.api.routing.Router.Attrs$, play.api.routing.Router.RequestImplicits$</code></li>
 </ul>
 </li>
 </ul>
@@ -142,7 +142,7 @@ <h3>Method Summary</h3>
 <li class="blockList"><a name="methods.inherited.from.class.play.api.routing.Router">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;play.api.routing.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">Router</a></h3>
+<h3>Methods inherited from interface&nbsp;play.api.routing.Router</h3>
 <code>$div$colon, $init$, asJava, concatPrefix, documentation, empty, from, handlerFor, load, orElse, routes, withPrefix</code></li>
 </ul>
 </li>
@@ -169,11 +169,7 @@ <h3>Methods inherited from interface&nbsp;play.api.routing.<a href="https://www.
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/PlayServiceCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/PlayServiceCall.html
index 5227cd1b81b..a5283113411 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/PlayServiceCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/PlayServiceCall.html
@@ -130,8 +130,8 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="https://www.playframework.com/documentation/latest/api/java/play/mvc/EssentialAction.html?is-external=true" title="class or interface in play.mvc">EssentialAction</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html#invoke-java.util.function.Function-">invoke</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/api/ServiceCall.html" title="interface in com.lightbend.lagom.javadsl.api">ServiceCall</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Request</a>,<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Response</a>&gt;,<a href="https://www.playframework.com/documentation/latest/api/java/play/mvc/EssentialAction.html?is-external=true" title="class or interface in play.mvc">EssentialAction</a>&gt;&nbsp;wrapCall)</code>
+<td class="colFirst"><code>play.mvc.EssentialAction</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html#invoke-java.util.function.Function-">invoke</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/api/ServiceCall.html" title="interface in com.lightbend.lagom.javadsl.api">ServiceCall</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Request</a>,<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Response</a>&gt;,play.mvc.EssentialAction&gt;&nbsp;wrapCall)</code>
 <div class="block">Low level hook for implementing service calls directly in Play.</div>
 </td>
 </tr>
@@ -190,7 +190,7 @@ <h4>invoke</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>invoke</h4>
-<pre><a href="https://www.playframework.com/documentation/latest/api/java/play/mvc/EssentialAction.html?is-external=true" title="class or interface in play.mvc">EssentialAction</a>&nbsp;invoke(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/api/ServiceCall.html" title="interface in com.lightbend.lagom.javadsl.api">ServiceCall</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Request</a>,<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Response</a>&gt;,<a href="https://www.playframework.com/documentation/latest/api/java/play/mvc/EssentialAction.html?is-external=true" title="class or interface in play.mvc">EssentialAction</a>&gt;&nbsp;wrapCall)</pre>
+<pre>play.mvc.EssentialAction&nbsp;invoke(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/api/ServiceCall.html" title="interface in com.lightbend.lagom.javadsl.api">ServiceCall</a>&lt;<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Request</a>,<a href="../../../../../com/lightbend/lagom/javadsl/server/PlayServiceCall.html" title="type parameter in PlayServiceCall">Response</a>&gt;,play.mvc.EssentialAction&gt;&nbsp;wrapCall)</pre>
 <div class="block">Low level hook for implementing service calls directly in Play.
 
  This can only be used to hook into plain HTTP calls, it can't be used to hook into WebSocket calls.</div>
@@ -230,11 +230,7 @@ <h4>invoke</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServerServiceCall.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServerServiceCall.html
index 071e8565420..cf4f8381ac0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServerServiceCall.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServerServiceCall.html
@@ -294,11 +294,7 @@ <h4>handleRequestHeader</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ClassServiceBinding.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ClassServiceBinding.html
index 909848d904b..934431d3db6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ClassServiceBinding.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ClassServiceBinding.html
@@ -212,11 +212,7 @@ <h4>serviceImplementation</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.InstanceServiceBinding.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.InstanceServiceBinding.html
index 19a6f521a51..d122764b9f8 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.InstanceServiceBinding.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.InstanceServiceBinding.html
@@ -250,11 +250,7 @@ <h4>service</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.LagomServiceBuilder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.LagomServiceBuilder.html
index de42585caea..1ca7728e424 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.LagomServiceBuilder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.LagomServiceBuilder.html
@@ -191,11 +191,7 @@ <h4>bind</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ServiceBinding.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ServiceBinding.html
index 919b3b9eb01..3f768cedafd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ServiceBinding.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.ServiceBinding.html
@@ -194,11 +194,7 @@ <h4>serviceInterface</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html
index 019ad5bd8df..a4552422fc7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html
@@ -163,17 +163,17 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>default &lt;R extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;<br><a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a></code></td>
+<td class="colFirst"><code>default &lt;R extends play.api.routing.Router&gt;<br><a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#additionalRouter-java.lang.Class-">additionalRouter</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;R&gt;&nbsp;router)</code>
 <div class="block">Helper method to create an <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.</div>
+ declare additional Play <code>Router</code>s on a Lagom Service.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>default <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#additionalRouter-play.api.routing.Router-">additionalRouter</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;router)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#additionalRouter-play.api.routing.Router-">additionalRouter</a></span>(play.api.routing.Router&nbsp;router)</code>
 <div class="block">Helper method to create an <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.</div>
+ declare additional Play <code>Router</code>s on a Lagom Service.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
@@ -266,18 +266,18 @@ <h3>Method Detail</h3>
 <li class="blockList">
 <h4>additionalRouter</h4>
 <pre>@ApiMayChange
-default&nbsp;&lt;R extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;&nbsp;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&nbsp;additionalRouter(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;R&gt;&nbsp;router)</pre>
+default&nbsp;&lt;R extends play.api.routing.Router&gt;&nbsp;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&nbsp;additionalRouter(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;R&gt;&nbsp;router)</pre>
 <div class="block">Helper method to create an <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.
+ declare additional Play <code>Router</code>s on a Lagom Service.
 
 
- <p>This method should be used when the <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a> has some dependencies and needs to get them injected
+ <p>This method should be used when the <code>Router</code> has some dependencies and needs to get them injected
  by Lagom's runtime DI infrastructure (Guice).
 
- <p>Typically, this will be a <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a> generated from a Play <code>routes</code>
- or a akka-grpc generated Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>.
+ <p>Typically, this will be a <code>Router</code> generated from a Play <code>routes</code>
+ or a akka-grpc generated Play <code>Router</code>.
 
- <p>Once you declare a <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>, you may need to define its prefix to indicate on which path it should be available.
+ <p>Once you declare a <code>Router</code>, you may need to define its prefix to indicate on which path it should be available.
 
  <pre>
  bindService(
@@ -286,8 +286,8 @@ <h4>additionalRouter</h4>
  );
  </pre>
 
- You don't need to configure a prefix if the <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a> has it pre-configured.
- A akka-grpc generated Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>, for instance, has its prefix already defined by the gRPC descriptor
+ You don't need to configure a prefix if the <code>Router</code> has it pre-configured.
+ A akka-grpc generated Play <code>Router</code>, for instance, has its prefix already defined by the gRPC descriptor
  and doesn't need to have its prefix reconfigured.
 
  <p>Note that this method won't create a binding and is intended to be used in conjunction with
@@ -309,15 +309,15 @@ <h4>additionalRouter</h4>
 <li class="blockList">
 <h4>additionalRouter</h4>
 <pre>@ApiMayChange
-default&nbsp;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&nbsp;additionalRouter(<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&nbsp;router)</pre>
+default&nbsp;<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server">AdditionalRouter</a>&nbsp;additionalRouter(play.api.routing.Router&nbsp;router)</pre>
 <div class="block">Helper method to create an <a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.
+ declare additional Play <code>Router</code>s on a Lagom Service.
 
 
- <p>This method should be used when the <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a> does not have any
+ <p>This method should be used when the <code>Router</code> does not have any
  other dependencies and therefore can be immediately passed as an instance.
 
- <p>Once you declare a <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>, you may need to define its prefix to indicate on which path it should be available.
+ <p>Once you declare a <code>Router</code>, you may need to define its prefix to indicate on which path it should be available.
 
  <pre>
  bindService(
@@ -326,7 +326,7 @@ <h4>additionalRouter</h4>
  );
  </pre>
 
- You don't need to configure a prefix if the <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a> has it pre-configured.
+ You don't need to configure a prefix if the <code>Router</code> has it pre-configured.
 
  <p>Note that this method won't create a binding and is intended to be used in conjunction with
  <a href="../../../../../com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#bindService-java.lang.Class-T-com.lightbend.lagom.javadsl.server.AdditionalRouter-com.lightbend.lagom.javadsl.server.AdditionalRouter...-"><code>bindService(Class, Service, AdditionalRouter, AdditionalRouter...)</code></a>
@@ -548,11 +548,7 @@ <h4>serviceBinding</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-summary.html
index c47b582a674..c50facba0fd 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-summary.html
@@ -131,7 +131,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.serve
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../com/lightbend/lagom/javadsl/server/ClassBased.html" title="class in com.lightbend.lagom.javadsl.server">ClassBased</a>&lt;R extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt;</td>
+<td class="colFirst"><a href="../../../../../com/lightbend/lagom/javadsl/server/ClassBased.html" title="class in com.lightbend.lagom.javadsl.server">ClassBased</a>&lt;R extends play.api.routing.Router&gt;</td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -184,11 +184,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.serve
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-tree.html
index 2d1ef7530a8..67ac4e7e797 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/package-tree.html
@@ -101,7 +101,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.server.<a href="../../../../../com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">AdditionalRouter</span></a></li>
-<li type="circle">play.api.routing.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Router</span></a>
+<li type="circle">play.api.routing.Router
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.server.<a href="../../../../../com/lightbend/lagom/javadsl/server/LagomServiceRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">LagomServiceRouter</span></a></li>
 </ul>
@@ -140,11 +140,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractCircuitBreakerStatus.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractCircuitBreakerStatus.html
index 4dcdc26f7a1..cfc7d5b9d26 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractCircuitBreakerStatus.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractCircuitBreakerStatus.html
@@ -288,11 +288,7 @@ <h4>getFailedThroughputOneMinute</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractLatency.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractLatency.html
index a9a58d090cf..cd21113944b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractLatency.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/AbstractLatency.html
@@ -282,11 +282,7 @@ <h4>getMax</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.Builder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.Builder.html
index dc1083c4100..ff2318602fe 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.Builder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.Builder.html
@@ -406,11 +406,7 @@ <h4>build</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.html
index ef759eb0f73..7b222fdfddc 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/CircuitBreakerStatus.html
@@ -658,11 +658,7 @@ <h4>builder</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.Builder.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.Builder.html
index 40ce81a44da..065f9fbf1ce 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.Builder.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.Builder.html
@@ -383,11 +383,7 @@ <h4>build</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.html
index ad741241136..5d6b71451ef 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/Latency.html
@@ -605,11 +605,7 @@ <h4>builder</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/MetricsService.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/MetricsService.html
index 97d3872f1ee..f84e3cf4255 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/MetricsService.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/MetricsService.html
@@ -224,11 +224,7 @@ <h4>descriptor</h4>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-summary.html
index 3f96973dd0d..c1134201981 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-summary.html
@@ -151,11 +151,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.serve
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-tree.html
index 21c060876cc..0a67c7a2981 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/server/status/package-tree.html
@@ -114,11 +114,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver$.html
index ca1d030cb16..e21bcbe7e07 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver$.html
@@ -225,11 +225,7 @@ <h4>PersistentEntityTestDriver$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Issue.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Issue.html
index 80ee8729991..15420c4bb3d 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Issue.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Issue.html
@@ -124,11 +124,7 @@ <h2 title="Interface PersistentEntityTestDriver.Issue" class="title">Interface P
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer$.html
index e7f3450611d..de82338a550 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer$.html
@@ -257,11 +257,7 @@ <h4>NoSerializer$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer.html
index fcb46359974..e1c96c243fc 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NoSerializer.html
@@ -279,11 +279,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable$.html
index e88544ecb34..3001419c1f0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable$.html
@@ -257,11 +257,7 @@ <h4>NotDeserializable$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable.html
index 2b8f203bcd8..9ecf7afa749 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotDeserializable.html
@@ -279,11 +279,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization$.html
index 2592016a65f..4ee605f75ff 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization$.html
@@ -257,11 +257,7 @@ <h4>NotEqualAfterSerialization$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization.html
index c1c90d4f85f..6941231fda9 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotEqualAfterSerialization.html
@@ -294,11 +294,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable$.html
index 740902329cc..de3a27a594e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable$.html
@@ -257,11 +257,7 @@ <h4>NotSerializable$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable.html
index 696b8d25c74..4ceeb80aa3b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.NotSerializable.html
@@ -279,11 +279,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome$.html
index effcbc16f84..9f799fb6534 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome$.html
@@ -238,11 +238,7 @@ <h4>Outcome$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome.html
index e42f0904c37..a846fe44384 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Outcome.html
@@ -312,11 +312,7 @@ <h4>getReplies</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply$.html
index cb877004c70..6182edad9f5 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply$.html
@@ -257,11 +257,7 @@ <h4>Reply$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply.html
index 364d190bd75..1e7fcc2d46c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.Reply.html
@@ -247,11 +247,7 @@ <h4>msg</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.SideEffect.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.SideEffect.html
index c14ea2b6589..07d185412d0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.SideEffect.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.SideEffect.html
@@ -124,11 +124,7 @@ <h2 title="Interface PersistentEntityTestDriver.SideEffect" class="title">Interf
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand$.html
index caad886284f..bfd7a9303b6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand$.html
@@ -257,11 +257,7 @@ <h4>UnhandledCommand$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand.html
index 413fc94cc7d..5ff4cb5f33b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledCommand.html
@@ -264,11 +264,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent$.html
index bfa7646c589..e9a2fd5bae7 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent$.html
@@ -257,11 +257,7 @@ <h4>UnhandledEvent$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent.html
index 302eedc820d..fee35406850 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UnhandledEvent.html
@@ -264,11 +264,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer$.html
index 686b4bc00f3..32c429feaf8 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer$.html
@@ -257,11 +257,7 @@ <h4>UsingJavaSerializer$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer.html
index fbb5746a7e2..e28b2d6c9c5 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.UsingJavaSerializer.html
@@ -264,11 +264,7 @@ <h4>toString</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.html
index 9f5740c9f5b..30695ac1c89 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/PersistentEntityTestDriver.html
@@ -441,11 +441,7 @@ <h4>getAllIssues</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStub.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStub.html
index 20a7646b2f6..c5d8e8a147c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStub.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStub.html
@@ -273,11 +273,7 @@ <h4>topic</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStubFactory.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStubFactory.html
index bf51e62217c..09b4c7b1c98 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStubFactory.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ProducerStubFactory.html
@@ -224,11 +224,7 @@ <h4>producer</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html
index 4f52bb7f688..5baec540c81 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html
@@ -133,7 +133,7 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html#ReadSideTestDriver-play.inject.Injector-akka.stream.Materializer-">ReadSideTestDriver</a></span>(<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Injector.html?is-external=true" title="class or interface in play.inject">Injector</a>&nbsp;injector,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ReadSideTestDriver.html#ReadSideTestDriver-play.inject.Injector-akka.stream.Materializer-">ReadSideTestDriver</a></span>(play.inject.Injector&nbsp;injector,
                   akka.stream.Materializer&nbsp;materializer)</code>&nbsp;</td>
 </tr>
 </table>
@@ -191,7 +191,7 @@ <h3>Constructor Detail</h3>
 <li class="blockList">
 <h4>ReadSideTestDriver</h4>
 <pre>@Inject
-public&nbsp;ReadSideTestDriver(<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Injector.html?is-external=true" title="class or interface in play.inject">Injector</a>&nbsp;injector,
+public&nbsp;ReadSideTestDriver(play.inject.Injector&nbsp;injector,
                                   akka.stream.Materializer&nbsp;materializer)</pre>
 </li>
 </ul>
@@ -257,11 +257,7 @@ <h4>feed</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest$.html
index e181dd696c9..b7c66ddcf6e 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest$.html
@@ -182,7 +182,7 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>&lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;</code></td>
+<td class="colFirst"><code>&lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest$.html#bind-java.lang.Class-">bind</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</code>
 <div class="block">Create a binding that can be used with the <code>GuiceApplicationBuilder</code>
  in the <code>Setup</code>, e.g.</div>
@@ -361,7 +361,7 @@ <h4>eventually</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bind</h4>
-<pre>public&nbsp;&lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
+<pre>public&nbsp;&lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
 <div class="block">Create a binding that can be used with the <code>GuiceApplicationBuilder</code>
  in the <code>Setup</code>, e.g. to override bindings to stub out dependencies to
  other services.</div>
@@ -391,11 +391,7 @@ <h4>bind</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html
index cf1fabdb7be..bb4c335767c 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html
@@ -135,14 +135,14 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;</code></td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html#configureBuilder--">configureBuilder</a></span>()</code>
 <div class="block">The builder configuration function</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html#configureBuilder-java.util.function.Function-">configureBuilder</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;&nbsp;configureBuilder)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html#configureBuilder-java.util.function.Function-">configureBuilder</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;&nbsp;configureBuilder)</code>
 <div class="block">Configure the builder.</div>
 </td>
 </tr>
@@ -184,7 +184,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html#withConfigureBuilder-java.util.function.Function-">withConfigureBuilder</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;&nbsp;configureBuilder)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html#withConfigureBuilder-java.util.function.Function-">withConfigureBuilder</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;&nbsp;configureBuilder)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Use configureBuilder instead. Since 1.2.0.</span></div>
 </div>
@@ -263,7 +263,7 @@ <h4>cluster</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>configureBuilder</h4>
-<pre><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a>&nbsp;configureBuilder(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;&nbsp;configureBuilder)</pre>
+<pre><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a>&nbsp;configureBuilder(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;&nbsp;configureBuilder)</pre>
 <div class="block">Configure the builder.
  <p>
  Allows a function to be supplied to configure the Play Guice application builder. This allows components to be
@@ -283,7 +283,7 @@ <h4>configureBuilder</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>configureBuilder</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;&nbsp;configureBuilder()</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;&nbsp;configureBuilder()</pre>
 <div class="block">The builder configuration function</div>
 </li>
 </ul>
@@ -389,7 +389,7 @@ <h4>withCluster</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>withConfigureBuilder</h4>
-<pre><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a>&nbsp;withConfigureBuilder(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>,<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/guice/GuiceApplicationBuilder.html?is-external=true" title="class or interface in play.inject.guice">GuiceApplicationBuilder</a>&gt;&nbsp;configureBuilder)</pre>
+<pre><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.Setup.html" title="interface in com.lightbend.lagom.javadsl.testkit">ServiceTest.Setup</a>&nbsp;withConfigureBuilder(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html?is-external=true" title="class or interface in java.util.function">Function</a>&lt;play.inject.guice.GuiceApplicationBuilder,play.inject.guice.GuiceApplicationBuilder&gt;&nbsp;configureBuilder)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use configureBuilder instead. Since 1.2.0.</span></div>
 </li>
 </ul>
@@ -495,11 +495,7 @@ <h4>withSsl</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer$.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer$.html
index 0ac97f9731b..f4f78b0a029 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer$.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer$.html
@@ -229,11 +229,7 @@ <h4>TestServer$</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html
index 0557968157c..c7cc1fdf1c6 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html
@@ -134,8 +134,8 @@ <h3>Constructor Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html#TestServer-int-play.Application-play.core.server.Server-java.util.Optional-">TestServer</a></span>(int&nbsp;port,
-          <a href="https://www.playframework.com/documentation/latest/api/java/play/Application.html?is-external=true" title="class or interface in play">Application</a>&nbsp;app,
-          <a href="https://www.playframework.com/documentation/latest/api/java/play/core/server.Server.html?is-external=true" title="class or interface in play.core">play.core.server.Server</a>&nbsp;server,
+          play.Application&nbsp;app,
+          play.core.server.Server&nbsp;server,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/javax/net/ssl/SSLContext.html?is-external=true" title="class or interface in javax.net.ssl">SSLContext</a>&gt;&nbsp;clientSslContext)</code>&nbsp;</td>
 </tr>
 </table>
@@ -154,7 +154,7 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="https://www.playframework.com/documentation/latest/api/java/play/Application.html?is-external=true" title="class or interface in play">Application</a></code></td>
+<td class="colFirst"><code>play.Application</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html#app--">app</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -168,7 +168,7 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html#clientSslContext--">clientSslContext</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Injector.html?is-external=true" title="class or interface in play.inject">Injector</a></code></td>
+<td class="colFirst"><code>play.inject.Injector</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html#injector--">injector</a></span>()</code>
 <div class="block">The Guice injector that can be used for retrieving anything
  that has been bound to Guice.</div>
@@ -230,8 +230,8 @@ <h3>Constructor Detail</h3>
 <li class="blockList">
 <h4>TestServer</h4>
 <pre>public&nbsp;TestServer(int&nbsp;port,
-                  <a href="https://www.playframework.com/documentation/latest/api/java/play/Application.html?is-external=true" title="class or interface in play">Application</a>&nbsp;app,
-                  <a href="https://www.playframework.com/documentation/latest/api/java/play/core/server.Server.html?is-external=true" title="class or interface in play.core">play.core.server.Server</a>&nbsp;server,
+                  play.Application&nbsp;app,
+                  play.core.server.Server&nbsp;server,
                   <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/javax/net/ssl/SSLContext.html?is-external=true" title="class or interface in javax.net.ssl">SSLContext</a>&gt;&nbsp;clientSslContext)</pre>
 </li>
 </ul>
@@ -258,7 +258,7 @@ <h4>port</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>app</h4>
-<pre>public&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/Application.html?is-external=true" title="class or interface in play">Application</a>&nbsp;app()</pre>
+<pre>public&nbsp;play.Application&nbsp;app()</pre>
 </li>
 </ul>
 <a name="clientSslContext--">
@@ -315,7 +315,7 @@ <h4>system</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>injector</h4>
-<pre>public&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Injector.html?is-external=true" title="class or interface in play.inject">Injector</a>&nbsp;injector()</pre>
+<pre>public&nbsp;play.inject.Injector&nbsp;injector()</pre>
 <div class="block">The Guice injector that can be used for retrieving anything
  that has been bound to Guice.</div>
 </li>
@@ -356,11 +356,7 @@ <h4>stop</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.html
index 8d16a4da5a7..e2d6eb1f8a1 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/ServiceTest.html
@@ -191,7 +191,7 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;</code></td>
+<td class="colFirst"><code>static &lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../com/lightbend/lagom/javadsl/testkit/ServiceTest.html#bind-java.lang.Class-">bind</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</code>
 <div class="block">Create a binding that can be used with the <code>GuiceApplicationBuilder</code>
  in the <code>Setup</code>, e.g.</div>
@@ -352,7 +352,7 @@ <h4>eventually</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bind</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.BindingKey.html?is-external=true" title="class or interface in play">play.api.inject.BindingKey</a>&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
+<pre>public static&nbsp;&lt;T&gt;&nbsp;play.api.inject.BindingKey&lt;T&gt;&nbsp;bind(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;clazz)</pre>
 <div class="block">Create a binding that can be used with the <code>GuiceApplicationBuilder</code>
  in the <code>Setup</code>, e.g. to override bindings to stub out dependencies to
  other services.</div>
@@ -382,11 +382,7 @@ <h4>bind</h4>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-summary.html
index dd866eda6f3..c4de96904d2 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-summary.html
@@ -248,11 +248,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.javadsl.testk
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-tree.html
index b0a33b2aa64..1d79240a603 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/javadsl/testkit/package-tree.html
@@ -145,11 +145,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/serialization/CompressedJsonable.html b/src/docs/latest/java/api/com/lightbend/lagom/serialization/CompressedJsonable.html
index 541e3d77ef6..e7e5b33cba4 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/serialization/CompressedJsonable.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/serialization/CompressedJsonable.html
@@ -124,11 +124,7 @@ <h2 title="Interface CompressedJsonable" class="title">Interface CompressedJsona
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/serialization/JacksonJsonMigration.html b/src/docs/latest/java/api/com/lightbend/lagom/serialization/JacksonJsonMigration.html
index 17571b7a15b..bb09638432b 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/serialization/JacksonJsonMigration.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/serialization/JacksonJsonMigration.html
@@ -280,11 +280,7 @@ <h4>transformClassName</h4>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/serialization/Jsonable.html b/src/docs/latest/java/api/com/lightbend/lagom/serialization/Jsonable.html
index 92255f899f4..0e5af290c37 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/serialization/Jsonable.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/serialization/Jsonable.html
@@ -129,11 +129,7 @@ <h2 title="Interface Jsonable" class="title">Interface Jsonable</h2>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-summary.html b/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-summary.html
index 9db9abec59a..21bb108e3b0 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-summary.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-summary.html
@@ -135,11 +135,7 @@ <h1 title="Package" class="title">Package&nbsp;com.lightbend.lagom.serialization
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-tree.html b/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-tree.html
index 51bd2833a92..01cb7c3f985 100644
--- a/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-tree.html
+++ b/src/docs/latest/java/api/com/lightbend/lagom/serialization/package-tree.html
@@ -117,11 +117,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/constant-values.html b/src/docs/latest/java/api/constant-values.html
index 8afefb6f706..0e13d5342fc 100644
--- a/src/docs/latest/java/api/constant-values.html
+++ b/src/docs/latest/java/api/constant-values.html
@@ -88,11 +88,7 @@ <h2 title="Contents">Contents</h2>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/deprecated-list.html b/src/docs/latest/java/api/deprecated-list.html
index 7d62e15a77e..494b41ff081 100644
--- a/src/docs/latest/java/api/deprecated-list.html
+++ b/src/docs/latest/java/api/deprecated-list.html
@@ -134,22 +134,22 @@ <h2 title="Contents">Contents</h2>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.TestUtil</a>
+<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.TestUtil</a>
 <div class="block"><span class="deprecationComment">Internal class, not intended for direct use. Since 1.5.0.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.TestUtil</a>
+<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.TestUtil</a>
 <div class="block"><span class="deprecationComment">Internal class, not intended for direct use. Since 1.5.0.</span></div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.TestUtil$</a>
+<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.TestUtil$</a>
 <div class="block"><span class="deprecationComment">Internal class, not intended for direct use. Since 1.5.0.</span></div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.TestUtil$</a>
+<td class="colOne"><a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.TestUtil$</a>
 <div class="block"><span class="deprecationComment">Internal class, not intended for direct use. Since 1.5.0.</span></div>
 </td>
 </tr>
@@ -287,11 +287,7 @@ <h2 title="Contents">Contents</h2>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/help-doc.html b/src/docs/latest/java/api/help-doc.html
index 0d8c910100a..1f4bac09e1d 100644
--- a/src/docs/latest/java/api/help-doc.html
+++ b/src/docs/latest/java/api/help-doc.html
@@ -189,11 +189,7 @@ <h2>Constant Field Values</h2>
 <li><a href="index-all.html">Index</a></li>
 <li class="navBarCell1Rev">Help</li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/index-all.html b/src/docs/latest/java/api/index-all.html
index 75f71365b84..7daf29693a5 100644
--- a/src/docs/latest/java/api/index-all.html
+++ b/src/docs/latest/java/api/index-all.html
@@ -121,12 +121,12 @@ <h2 class="title">A</h2>
 <dt><span class="memberNameLink"><a href="com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#additionalRouter-java.lang.Class-">additionalRouter(Class&lt;R&gt;)</a></span> - Method in interface com.lightbend.lagom.javadsl.server.<a href="com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html" title="interface in com.lightbend.lagom.javadsl.server">ServiceGuiceSupport</a></dt>
 <dd>
 <div class="block">Helper method to create an <a href="com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.</div>
+ declare additional Play <code>Router</code>s on a Lagom Service.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html#additionalRouter-play.api.routing.Router-">additionalRouter(Router)</a></span> - Method in interface com.lightbend.lagom.javadsl.server.<a href="com/lightbend/lagom/javadsl/server/ServiceGuiceSupport.html" title="interface in com.lightbend.lagom.javadsl.server">ServiceGuiceSupport</a></dt>
 <dd>
 <div class="block">Helper method to create an <a href="com/lightbend/lagom/javadsl/server/AdditionalRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><code>AdditionalRouter</code></a> instance that can be used to
- declare additional Play <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><code>Router</code></a>s on a Lagom Service.</div>
+ declare additional Play <code>Router</code>s on a Lagom Service.</div>
 </dd>
 <dt><a href="com/lightbend/lagom/javadsl/server/AdditionalRouter$.html" title="class in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">AdditionalRouter$</span></a> - Class in <a href="com/lightbend/lagom/javadsl/server/package-summary.html">com.lightbend.lagom.javadsl.server</a></dt>
 <dd>&nbsp;</dd>
@@ -561,7 +561,7 @@ <h2 class="title">C</h2>
 <div class="block"><span class="deprecationComment">Use constructor accepting <a href="com/lightbend/lagom/javadsl/client/CircuitBreakersPanel.html" title="interface in com.lightbend.lagom.javadsl.client"><code>CircuitBreakersPanel</code></a> instead</span></div>
 </div>
 </dd>
-<dt><a href="com/lightbend/lagom/javadsl/server/ClassBased.html" title="class in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">ClassBased</span></a>&lt;<a href="com/lightbend/lagom/javadsl/server/ClassBased.html" title="type parameter in ClassBased">R</a> extends <a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>&gt; - Class in <a href="com/lightbend/lagom/javadsl/server/package-summary.html">com.lightbend.lagom.javadsl.server</a></dt>
+<dt><a href="com/lightbend/lagom/javadsl/server/ClassBased.html" title="class in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">ClassBased</span></a>&lt;<a href="com/lightbend/lagom/javadsl/server/ClassBased.html" title="type parameter in ClassBased">R</a> extends play.api.routing.Router&gt; - Class in <a href="com/lightbend/lagom/javadsl/server/package-summary.html">com.lightbend.lagom.javadsl.server</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/lightbend/lagom/javadsl/server/ClassBased.html#ClassBased-java.lang.Class-scala.Option-">ClassBased(Class&lt;R&gt;, Option&lt;String&gt;)</a></span> - Constructor for class com.lightbend.lagom.javadsl.server.<a href="com/lightbend/lagom/javadsl/server/ClassBased.html" title="class in com.lightbend.lagom.javadsl.server">ClassBased</a></dt>
 <dd>&nbsp;</dd>
@@ -4177,11 +4177,7 @@ <h2 class="title">W</h2>
 <li class="navBarCell1Rev">Index</li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/overview-summary.html b/src/docs/latest/java/api/overview-summary.html
index 420a8c99f58..d2881fb81ad 100644
--- a/src/docs/latest/java/api/overview-summary.html
+++ b/src/docs/latest/java/api/overview-summary.html
@@ -239,11 +239,7 @@
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/overview-tree.html b/src/docs/latest/java/api/overview-tree.html
index f52edffa6ec..ed72015ee91 100644
--- a/src/docs/latest/java/api/overview-tree.html
+++ b/src/docs/latest/java/api/overview-tree.html
@@ -204,13 +204,13 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.lightbend.lagom.javadsl.api.deser.<a href="com/lightbend/lagom/javadsl/api/deser/MessageSerializers.html" title="class in com.lightbend.lagom.javadsl.api.deser"><span class="typeNameLink">MessageSerializers</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.api.broker.<a href="com/lightbend/lagom/javadsl/api/broker/MetadataKey.html" title="class in com.lightbend.lagom.javadsl.api.broker"><span class="typeNameLink">MetadataKey</span></a>&lt;Metadata&gt;</li>
 <li type="circle">com.lightbend.lagom.javadsl.api.transport.<a href="com/lightbend/lagom/javadsl/api/transport/Method.html" title="class in com.lightbend.lagom.javadsl.api.transport"><span class="typeNameLink">Method</span></a></li>
-<li type="circle">play.api.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.inject.Module.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.api.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.cluster.testkit.<a href="com/lightbend/lagom/javadsl/cluster/testkit/ActorSystemModule.html" title="class in com.lightbend.lagom.javadsl.cluster.testkit"><span class="typeNameLink">ActorSystemModule</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.<a href="com/lightbend/lagom/javadsl/persistence/cassandra/CassandraPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra"><span class="typeNameLink">CassandraPersistenceModule</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.jackson.<a href="com/lightbend/lagom/javadsl/jackson/JacksonModule.html" title="class in com.lightbend.lagom.javadsl.jackson"><span class="typeNameLink">JacksonModule</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jdbc.<a href="com/lightbend/lagom/javadsl/persistence/jdbc/JdbcPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc"><span class="typeNameLink">JdbcPersistenceModule</span></a></li>
-<li type="circle">play.inject.<a href="https://www.playframework.com/documentation/latest/api/java/play/inject/Module.html?is-external=true" title="class or interface in play.inject"><span class="typeNameLink">Module</span></a>
+<li type="circle">play.inject.Module
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jpa.<a href="com/lightbend/lagom/javadsl/persistence/jpa/JpaPersistenceModule.html" title="class in com.lightbend.lagom.javadsl.persistence.jpa"><span class="typeNameLink">JpaPersistenceModule</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.broker.kafka.<a href="com/lightbend/lagom/javadsl/broker/kafka/KafkaClientModule.html" title="class in com.lightbend.lagom.javadsl.broker.kafka"><span class="typeNameLink">KafkaClientModule</span></a></li>
@@ -286,10 +286,10 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.lightbend.lagom.javadsl.testkit.<a href="com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer.html" title="class in com.lightbend.lagom.javadsl.testkit"><span class="typeNameLink">ServiceTest.TestServer</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.testkit.<a href="com/lightbend/lagom/javadsl/testkit/ServiceTest.TestServer$.html" title="class in com.lightbend.lagom.javadsl.testkit"><span class="typeNameLink">ServiceTest.TestServer$</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.testkit.<a href="com/lightbend/lagom/javadsl/testkit/ServiceTest$.html" title="class in com.lightbend.lagom.javadsl.testkit"><span class="typeNameLink">ServiceTest$</span></a></li>
-<li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.<a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit"><span class="typeNameLink">TestUtil</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.<a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit"><span class="typeNameLink">TestUtil</span></a></li>
-<li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.<a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit"><span class="typeNameLink">TestUtil$</span></a> (implements com.lightbend.lagom.javadsl.persistence.testkit.<a href="com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html" title="interface in com.lightbend.lagom.javadsl.persistence.testkit">AbstractTestUtil</a>)</li>
+<li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.<a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit"><span class="typeNameLink">TestUtil</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.jdbc.testkit.<a href="com/lightbend/lagom/javadsl/persistence/jdbc/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.jdbc.testkit"><span class="typeNameLink">TestUtil$</span></a> (implements com.lightbend.lagom.javadsl.persistence.testkit.<a href="com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html" title="interface in com.lightbend.lagom.javadsl.persistence.testkit">AbstractTestUtil</a>)</li>
+<li type="circle">com.lightbend.lagom.javadsl.persistence.cassandra.testkit.<a href="com/lightbend/lagom/javadsl/persistence/cassandra/testkit/TestUtil$.html" title="class in com.lightbend.lagom.javadsl.persistence.cassandra.testkit"><span class="typeNameLink">TestUtil$</span></a> (implements com.lightbend.lagom.javadsl.persistence.testkit.<a href="com/lightbend/lagom/javadsl/persistence/testkit/AbstractTestUtil.html" title="interface in com.lightbend.lagom.javadsl.persistence.testkit">AbstractTestUtil</a>)</li>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle"><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
@@ -380,7 +380,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 </li>
 <li type="circle">com.lightbend.lagom.javadsl.pubsub.<a href="com/lightbend/lagom/javadsl/pubsub/PubSubRegistry.html" title="interface in com.lightbend.lagom.javadsl.pubsub"><span class="typeNameLink">PubSubRegistry</span></a></li>
 <li type="circle">com.lightbend.lagom.javadsl.persistence.<a href="com/lightbend/lagom/javadsl/persistence/ReadSide.html" title="interface in com.lightbend.lagom.javadsl.persistence"><span class="typeNameLink">ReadSide</span></a></li>
-<li type="circle">play.api.routing.<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play"><span class="typeNameLink">Router</span></a>
+<li type="circle">play.api.routing.Router
 <ul>
 <li type="circle">com.lightbend.lagom.javadsl.server.<a href="com/lightbend/lagom/javadsl/server/LagomServiceRouter.html" title="interface in com.lightbend.lagom.javadsl.server"><span class="typeNameLink">LagomServiceRouter</span></a></li>
 </ul>
@@ -448,11 +448,7 @@ <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/api/serialized-form.html b/src/docs/latest/java/api/serialized-form.html
index d3452d3a33e..e60d54e2010 100644
--- a/src/docs/latest/java/api/serialized-form.html
+++ b/src/docs/latest/java/api/serialized-form.html
@@ -390,7 +390,7 @@ <h3>Class <a href="com/lightbend/lagom/javadsl/server/InstanceBased.html" title=
 <li class="blockList"><a name="com.lightbend.lagom.javadsl.server.InstanceBased:D">
 <!--   -->
 </a>
-<h3>Class <a href="com/lightbend/lagom/javadsl/server/InstanceBased$.html" title="class in com.lightbend.lagom.javadsl.server">com.lightbend.lagom.javadsl.server.InstanceBased$</a> extends scala.runtime.AbstractFunction2&lt;<a href="https://www.playframework.com/documentation/latest/api/java/play/api.routing.Router.html?is-external=true" title="class or interface in play">play.api.routing.Router</a>,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt; implements Serializable</h3>
+<h3>Class <a href="com/lightbend/lagom/javadsl/server/InstanceBased$.html" title="class in com.lightbend.lagom.javadsl.server">com.lightbend.lagom.javadsl.server.InstanceBased$</a> extends scala.runtime.AbstractFunction2&lt;play.api.routing.Router,scala.Option&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;,<a href="com/lightbend/lagom/javadsl/server/InstanceBased.html" title="class in com.lightbend.lagom.javadsl.server">InstanceBased</a>&gt; implements Serializable</h3>
 </li>
 </ul>
 </li>
@@ -511,11 +511,7 @@ <h2 title="Package">Package&nbsp;com.lightbend.lagom.serialization</h2>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html">Help</a></li>
 </ul>
-<div class="aboutLanguage"><script type="text/javascript">
-  if (window.name == "classFrame" && window.top.location.hash) {
-    window.location.href = window.top.location.hash;
-  }
-</script></div>
+<div class="aboutLanguage"><script type=\"text/javascript\">\n  if (window.name == \"classFrame\" && window.top.location.hash) {\n    window.location.href = window.top.location.hash;\n  }\n</script></div>
 </div>
 <div class="subNav">
 <ul class="navList">
diff --git a/src/docs/latest/java/resources/guide/devmode/code/dev-environment.sbt b/src/docs/latest/java/resources/guide/devmode/code/dev-environment.sbt
index 5bf964559a9..9a571c6f6f8 100644
--- a/src/docs/latest/java/resources/guide/devmode/code/dev-environment.sbt
+++ b/src/docs/latest/java/resources/guide/devmode/code/dev-environment.sbt
@@ -21,6 +21,7 @@ startElasticSearch in ThisBuild := {
     elasticsearch / "bin" / "elasticsearch"
   }
 
+  import scala.sys.process._
   val process = Process(binFile.getAbsolutePath, elasticsearch).run(log)
   log.info("Elastic search started on port 9200")
 
diff --git a/src/docs/latest/java/resources/releases/Migration15.md b/src/docs/latest/java/resources/releases/Migration15.md
index 6f8c6ce1362..6a65774b49b 100644
--- a/src/docs/latest/java/resources/releases/Migration15.md
+++ b/src/docs/latest/java/resources/releases/Migration15.md
@@ -86,6 +86,23 @@ These new defaults may require at least two changes on your codebase. First, if
 
 You no longer have a `ServiceLocator` provided by the tooling libraries so you will have to provide one of your choice. We recommend using the new [`lagom-akka-discovery-service-locator`](https://github.com/lagom/lagom-akka-discovery-service-locator) which is implemented using [Akka Service Discovery](https://doc.akka.io/docs/akka/current/discovery/index.html) implementations.
 
+
+You first need to add the following dependency to each service implementation in your `build.sbt`.
+
+```
+"com.lightbend.lagom" %% "lagom-javadsl-akka-discovery-service-locator" % "1.0.0"
+```
+
+or if you are using `maven`.
+
+```
+<dependency>
+    <groupId>com.lightbend.lagom</groupId>
+    <artifactId>lagom-javadsl-akka-discovery-service-locator_2.12</artifactId>
+    <version>1.0.0</version>
+</dependency>
+```
+
 Read the [docs](https://github.com/lagom/lagom-akka-discovery-service-locator) of the new `lagom-akka-discovery-service-locator` for details on how to setup the Akka Service Discovery [method](https://doc.akka.io/docs/akka/current/discovery/index.html). For example,
 
 ```
diff --git a/src/docs/latest/scala/CoreConcepts.html b/src/docs/latest/scala/CoreConcepts.html
index 6205a3eb9e6..84c5c2f8847 100644
--- a/src/docs/latest/scala/CoreConcepts.html
+++ b/src/docs/latest/scala/CoreConcepts.html
@@ -48,4 +48,3 @@ <h1 id="Introduction-to-Lagom-concepts"><a class="section-marker" href="#Introdu
   </li>
 </ul>
 
-
diff --git a/src/docs/latest/scala/DevEnvironment.html b/src/docs/latest/scala/DevEnvironment.html
index 6849c8ae62c..d37a62f3260 100644
--- a/src/docs/latest/scala/DevEnvironment.html
+++ b/src/docs/latest/scala/DevEnvironment.html
@@ -59,6 +59,7 @@ <h1 id="Development-Environment"><a class="section-marker" href="#Development-En
     elasticsearch / &quot;bin&quot; / &quot;elasticsearch&quot;
   }
 
+  import scala.sys.process._
   val process = Process(binFile.getAbsolutePath, elasticsearch).run(log)
   log.info(&quot;Elastic search started on port 9200&quot;)
 
diff --git a/src/docs/latest/scala/Home.html b/src/docs/latest/scala/Home.html
index 5be0f7d0001..d8b6ee79ee4 100644
--- a/src/docs/latest/scala/Home.html
+++ b/src/docs/latest/scala/Home.html
@@ -1,6 +1,5 @@
 
 
-
     <h2>Welcome to Lagom</h2>
     <ol>
     <li>
diff --git a/src/docs/latest/scala/Migration15.html b/src/docs/latest/scala/Migration15.html
index 75524b4c8ed..f573329b3db 100644
--- a/src/docs/latest/scala/Migration15.html
+++ b/src/docs/latest/scala/Migration15.html
@@ -34,7 +34,10 @@ <h1 id="Lagom-1.5-Migration-Guide"><a class="section-marker" href="#Lagom-1.5-Mi
 <p>Cluster formation now also supports <a href="Cluster.html#Joining-during-production-(Akka-Cluster-Bootstrap)">Cluster Bootstrapping</a> as a new way to form a cluster.</p>
 <p>These new defaults may require at least two changes on your codebase. First, if you want to opt-in to cluster bootstrapping you must make sure you don&rsquo;t set <code>seed-nodes</code>. <code>seed-nodes</code> always takes precedence over any other cluster formation mechanism. Second, if you use Cluster Bootstrapping, you will have to setup a <a href="https://doc.akka.io/docs/akka/2.5/discovery/index.html">discovery</a> mechanism (see the <a href="Cluster.html#Akka-Discovery">Lagom Cluster reference guide</a> for more details).</p><h4 id="Service-Location"><a class="section-marker" href="#Service-Location">§</a>Service Location</h4>
 <p>You no longer have a <code>ServiceLocator</code>provided by the tooling libraries so you will have to provide one of your choice. We recommend using the new <a href="https://github.com/lagom/lagom-akka-discovery-service-locator"><code>lagom-akka-discovery-service-locator</code></a> which is implemented using <a href="https://doc.akka.io/docs/akka/current/discovery/index.html">Akka Service Discovery</a> implementations.</p>
-<p>This means you will have to change you <code>Loader</code> code:</p>
+<p>You first need to add the following dependency to each service implementation in your <code>build.sbt</code>.</p>
+<pre class="prettyprint"><code class="language-scala">&quot;com.lightbend.lagom&quot; %% &quot;lagom-scaladsl-akka-discovery-service-locator&quot; % &quot;1.0.0&quot;
+</code></pre>
+<p>Next you will have to change the <code>Loader</code> code in each service implementation:</p>
 <pre class="prettyprint"><code class="language-scala">// before
   import com.lightbend.rp.servicediscovery.lagom.scaladsl.LagomServiceLocatorComponents
   override def load(context: LagomApplicationContext) =
diff --git a/src/docs/latest/scala/ReferenceGuide.html b/src/docs/latest/scala/ReferenceGuide.html
index e8e75bb2ff8..b00fe0ffbe8 100644
--- a/src/docs/latest/scala/ReferenceGuide.html
+++ b/src/docs/latest/scala/ReferenceGuide.html
@@ -1,6 +1,5 @@
 <h1 id="Lagom-reference-guide"><a class="section-marker" href="#Lagom-reference-guide">§</a>Lagom reference guide</h1>
 
-
     <h2>Configuring builds and the development environment</h2>
     <ol>
     <li>
diff --git a/src/docs/latest/scala/resources/guide/devmode/code/dev-environment.sbt b/src/docs/latest/scala/resources/guide/devmode/code/dev-environment.sbt
index 5bf964559a9..9a571c6f6f8 100644
--- a/src/docs/latest/scala/resources/guide/devmode/code/dev-environment.sbt
+++ b/src/docs/latest/scala/resources/guide/devmode/code/dev-environment.sbt
@@ -21,6 +21,7 @@ startElasticSearch in ThisBuild := {
     elasticsearch / "bin" / "elasticsearch"
   }
 
+  import scala.sys.process._
   val process = Process(binFile.getAbsolutePath, elasticsearch).run(log)
   log.info("Elastic search started on port 9200")
 
diff --git a/src/docs/latest/scala/resources/releases/Migration15.md b/src/docs/latest/scala/resources/releases/Migration15.md
index a6b89bc67cc..27f6f8e1899 100644
--- a/src/docs/latest/scala/resources/releases/Migration15.md
+++ b/src/docs/latest/scala/resources/releases/Migration15.md
@@ -77,7 +77,13 @@ These new defaults may require at least two changes on your codebase. First, if
 
 You no longer have a `ServiceLocator `provided by the tooling libraries so you will have to provide one of your choice. We recommend using the new [`lagom-akka-discovery-service-locator`](https://github.com/lagom/lagom-akka-discovery-service-locator) which is implemented using [Akka Service Discovery](https://doc.akka.io/docs/akka/current/discovery/index.html) implementations.
 
-This means you will have to change you `Loader` code:
+You first need to add the following dependency to each service implementation in your `build.sbt`.
+
+```scala
+"com.lightbend.lagom" %% "lagom-scaladsl-akka-discovery-service-locator" % "1.0.0"
+```
+
+Next you will have to change the `Loader` code in each service implementation:
 
 ```scala
 // before