diff --git a/docs/admin-guide/amqp-adapter-config/index.html b/docs/admin-guide/amqp-adapter-config/index.html
index ec16005..e7d3221 100644
--- a/docs/admin-guide/amqp-adapter-config/index.html
+++ b/docs/admin-guide/amqp-adapter-config/index.html
@@ -21,19 +21,19 @@
     <title>AMQP Adapter Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/amqp-adapter-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/amqp-adapter-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/amqp-adapter-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/amqp-adapter-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/amqp-adapter-config/">dev</option>
@@ -1945,6 +2005,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2225,6 +2301,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2547,20 +2639,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/amqp-network-config/index.html b/docs/admin-guide/amqp-network-config/index.html
index dfd3e35..ffc5547 100644
--- a/docs/admin-guide/amqp-network-config/index.html
+++ b/docs/admin-guide/amqp-network-config/index.html
@@ -21,19 +21,19 @@
     <title>AMQP 1.0 Messaging Network Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/amqp-network-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/amqp-network-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/amqp-network-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/amqp-network-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/amqp-network-config/">dev</option>
@@ -1726,6 +1786,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2006,6 +2082,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2328,20 +2420,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/auth-server-config/index.html b/docs/admin-guide/auth-server-config/index.html
index 9461a8e..3c5451b 100644
--- a/docs/admin-guide/auth-server-config/index.html
+++ b/docs/admin-guide/auth-server-config/index.html
@@ -21,19 +21,19 @@
     <title>Auth Server Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/auth-server-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/auth-server-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/auth-server-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/auth-server-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/auth-server-config/">dev</option>
@@ -1939,6 +1999,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2219,6 +2295,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2541,20 +2633,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/common-config/index.html b/docs/admin-guide/common-config/index.html
index 1ce7922..c5bae57 100644
--- a/docs/admin-guide/common-config/index.html
+++ b/docs/admin-guide/common-config/index.html
@@ -21,19 +21,19 @@
     <title>Common Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/common-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/common-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/common-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/common-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/common-config/">dev</option>
@@ -1397,7 +1457,10 @@
 <li><a href="#tenant-service-connection-configuration">Tenant Service Connection Configuration</a></li>
 <li><a href="#device-registration-service-connection-configuration">Device Registration Service Connection Configuration</a></li>
 <li><a href="#credentials-service-connection-configuration">Credentials Service Connection Configuration</a></li>
-<li><a href="#device-connection-service-connection-configuration">Device Connection Service Connection Configuration</a></li>
+<li><a href="#device-connection-service-connection-configuration">Device Connection Service Connection Configuration</a>
+<ul>
+<li><a href="#direct-connection-to-data-grid">Direct Connection to Data Grid</a></li>
+</ul></li>
 <li><a href="#resource-limits-checker-configuration">Resource Limits Checker Configuration</a></li>
 </ul></li>
 </ul></li>
@@ -1565,6 +1628,60 @@
 
 <p>Responses from the Device Connection service are never cached, so the properties for configuring the cache are ignored.</p>
 
+<h4 id="direct-connection-to-data-grid">Direct Connection to Data Grid</h4>
+
+<p>Protocol adapters can alternatively be configured to directly access an data grid for storing and retrieving
+device connection information using <a href="https://infinispan.org">Infinispan</a>&rsquo;s Hotrod protocol.
+This has the advantage of saving the network hop to the Device Connection service. However,
+this is only beneficial if the Device Connection service implementation itself uses a remote service (like a data grid) for
+storing the data.</p>
+
+<p>The following table provides an overview of the configuration variables and corresponding command line options for configuring
+the connection to the data grid:</p>
+
+<table>
+<thead>
+<tr>
+<th align="left">Environment Variable<br>Command Line Option</th>
+<th align="center">Mandatory</th>
+<th align="left">Default</th>
+<th align="left">Description</th>
+</tr>
+</thead>
+
+<tbody>
+<tr>
+<td align="left"><code>HONO_DEVICECONNECTION_SERVER_LIST</code><br><code>--hono.deviceConnection.serverList</code></td>
+<td align="center">yes</td>
+<td align="left">-</td>
+<td align="left">A list of remote servers in the form: <code>host1[:port][;host2[:port]]....</code>.</td>
+</tr>
+
+<tr>
+<td align="left"><code>HONO_DEVICECONNECTION_AUTH_SERVER_NAME</code><br><code>--hono.deviceConnection.authServerName</code></td>
+<td align="center">yes</td>
+<td align="left">-</td>
+<td align="left">The server name to indicate in the SASL handshake when authenticating to the server.</td>
+</tr>
+
+<tr>
+<td align="left"><code>HONO_DEVICECONNECTION_AUTH_USERNAME</code><br><code>--hono.deviceConnection.authUsername</code></td>
+<td align="center">yes</td>
+<td align="left">-</td>
+<td align="left">The username to use for authenticating to the server.</td>
+</tr>
+
+<tr>
+<td align="left"><code>HONO_DEVICECONNECTION_AUTH_PASSWORD</code><br><code>--hono.deviceConnection.authPassword</code></td>
+<td align="center">yes</td>
+<td align="left">-</td>
+<td align="left">The password to use for authenticating to the server.</td>
+</tr>
+</tbody>
+</table>
+
+<p>In general, the service supports all configuration properties of the <a href="https://docs.jboss.org/infinispan/9.4/apidocs/org/infinispan/client/hotrod/configuration/package-summary.html#package.description">Infinispan Hotrod client</a> using <code>hono.deviceConnection</code> instead of the <code>infinispan.client.hotrod</code> prefix.</p>
+
 <h3 id="resource-limits-checker-configuration">Resource Limits Checker Configuration</h3>
 
 <p>The adapter can use metrics collected by a Prometheus server to enforce certain limits set at the tenant level like the overall number of connected devices allowed per tenant.</p>
@@ -1585,7 +1702,7 @@
 <tr>
 <td align="left"><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_HOST</code><br><code>--hono.resourceLimits.prometheusBased.host</code></td>
 <td align="center">no</td>
-<td align="left">none</td>
+<td align="left"><code>localhost</code></td>
 <td align="left">The host name or IP address of the Prometheus server to retrieve the metrics data from. This property needs to be set in order to enable the Prometheus based checks.</td>
 </tr>
 
@@ -1619,6 +1736,24 @@
 </tbody>
 </table>
 
+<p>In addition to the properties listed above, the resource limit checker also supports the properties listed below as documented in the
+<a href="/hono/docs/admin-guide/hono-client-configuration/">Hono Client Configuration</a>. These properties might be useful if a reverse proxy in front of
+the Prometheus server requires the client to use TLS and/or provide credentials for authentication.</p>
+
+<ul>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_CREDENTIALSPATH</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_HOSTNAMEVERIFICATIONREQUIRED</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_KEYPATH</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_KEYSTOREPASSWORD</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_KEYSTOREPATH</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_PASSWORD</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_SECUREPROTOCOLS</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_TLSENABLED</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_TRUSTSTOREPATH</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_TRUSTSTOREPASSWORD</code></li>
+<li><code>HONO_RESOURCELIMITS_PROMETHEUSBASED_USERNAME</code></li>
+</ul>
+
 <footer class=" footline" >
 	
 </footer>
@@ -1922,6 +2057,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2199,6 +2350,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2521,20 +2688,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/device-connection-config/index.html b/docs/admin-guide/device-connection-config/index.html
index 3508845..f4d15aa 100644
--- a/docs/admin-guide/device-connection-config/index.html
+++ b/docs/admin-guide/device-connection-config/index.html
@@ -21,19 +21,19 @@
     <title>Configuring the Device Connection Service :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/device-connection-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/device-connection-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/device-connection-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/device-connection-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/device-connection-config/">dev</option>
@@ -1984,6 +2044,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2264,6 +2340,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2586,20 +2678,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/device-registry-config/index.html b/docs/admin-guide/device-registry-config/index.html
index 42bc706..5d50bda 100644
--- a/docs/admin-guide/device-registry-config/index.html
+++ b/docs/admin-guide/device-registry-config/index.html
@@ -21,19 +21,19 @@
     <title>Device Registry Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/device-registry-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/device-registry-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/device-registry-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/device-registry-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/device-registry-config/">dev</option>
@@ -1428,7 +1488,7 @@
 
 <p>The Device Registry component also exposes <a href="/hono/docs/user-guide/device-registry/">HTTP based resources</a> for managing tenants and the registration information and credentials of devices.</p>
 
-<p>The Device Registry is implemented as a Spring Boot application. It can be run either directly from the command line or by means of starting the corresponding <a href="https://hub.docker.com/r/eclipse/hono-service-device-registry/">Docker image</a> created from it.</p>
+<p>The Device Registry is implemented as a Spring Boot application. It can be run either directly from the command line or by means of starting the corresponding <a href="https://hub.docker.com/r/eclipse/hono-service-device-registry-file/">Docker image</a> created from it.</p>
 
 <h2 id="service-configuration">Service Configuration</h2>
 
@@ -1504,6 +1564,13 @@
 </tr>
 
 <tr>
+<td align="left"><code>HONO_CREDENTIALS_SVC_HASH_ALGORITHMS_WHITELIST</code><br><code>--hono.credentials.svc.hashAlgorithmsWhitelist</code></td>
+<td align="center">no</td>
+<td align="left"><code>empty</code></td>
+<td align="left">An array containing a whitelist of the authorised values for the hashing algorithms of the <code>hashed-password</code> type of credentials. When not set, all values will be accepted.</td>
+</tr>
+
+<tr>
 <td align="left"><code>HONO_DEVICE_CONNECTION_SVC_MAX_DEVICES_PER_TENANT</code><br><code>--hono.deviceConnection.svc.maxDevicesPerTenant</code></td>
 <td align="center">no</td>
 <td align="left"><code>100</code></td>
@@ -2190,6 +2257,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2470,6 +2553,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2792,20 +2891,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/hono-client-configuration/index.html b/docs/admin-guide/hono-client-configuration/index.html
index c073619..659b6a1 100644
--- a/docs/admin-guide/hono-client-configuration/index.html
+++ b/docs/admin-guide/hono-client-configuration/index.html
@@ -21,19 +21,19 @@
     <title>Hono Client Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/hono-client-configuration/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/hono-client-configuration/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/hono-client-configuration/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/hono-client-configuration/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/hono-client-configuration/">dev</option>
@@ -1410,14 +1470,23 @@
 
 <p>The <code>org.eclipse.hono.client.HonoConnection</code> factory can be used to create AMQP 1.0 connections to Hono&rsquo;s service components.</p>
 
-<p>The factory uses environment variables and/or command line options to configure the connection to the service and the caching of responses to service invocations. All variables used for configuring the connection factory for a particular service share a common <em>prefix</em>. This way, multiple sets of variables can be used to configure multiple factories for connecting to different service endpoints without interfering with each other. For example, the set of variables for configuring the connection factory for the Device Registration service may use the common prefix <code>HONO_REGISTRATION</code> whereas the set for configuring the factory for the Credentials service may use <code>HONO_CREDENTIALS</code>.</p>
+<p>The factory uses environment variables and/or command line options to configure the connection to the service and the caching of
+responses to service invocations. All variables used for configuring the connection factory for a particular service share a
+common <em>prefix</em>. This way, multiple sets of variables can be used to configure multiple factories for connecting to different
+service endpoints without interfering with each other. For example, the set of variables for configuring the connection factory
+for the Device Registration service may use the common prefix <code>HONO_REGISTRATION</code> whereas the set for configuring the factory
+for the Credentials service may use <code>HONO_CREDENTIALS</code>.</p>
 
 <h2 id="connection-properties">Connection Properties</h2>
 
-<p>The following table provides an overview of the configuration variables and corresponding command line options for configuring the AMQP connection to the service.
-Note that the variables map to the properties of class <code>org.eclipse.hono.config.ClientConfigProperties</code> which can be used to programmatically configure a client.</p>
+<p>The following table provides an overview of the configuration variables and corresponding command line options for configuring
+the AMQP connection to the service.
+Note that the variables map to the properties of classes <code>org.eclipse.hono.config.ClientConfigProperties</code>
+and <code>org.eclipse.client.RequestResponseClientConfigProperties</code> which can be used to programmatically configure a client.</p>
 
-<p>The variable names contain <code>${PREFIX}</code> as a placeholder for the particular <em>common prefix</em> being used. The <code>${prefix}</code> placeholder used in the command line option name is the same as <code>${PREFIX}</code>, using all lower case characters and <code>.</code> instead of <code>_</code> as the delimiter,  e.g. the variable prefix <code>HONO_CREDENTIALS</code> corresponds to the command line option prefix <code>hono.credentials</code>).</p>
+<p>The variable names contain <code>${PREFIX}</code> as a placeholder for the particular <em>common prefix</em> being used. The <code>${prefix}</code> placeholder
+used in the command line option name is the same as <code>${PREFIX}</code>, using all lower case characters and <code>.</code> instead of <code>_</code> as the
+delimiter,  e.g. the variable prefix <code>HONO_CREDENTIALS</code> corresponds to the command line option prefix <code>hono.credentials</code>).</p>
 
 <table>
 <thead>
@@ -1431,35 +1500,35 @@
 
 <tbody>
 <tr>
-<td align="left"><code>${PREFIX}_AMQP_HOSTNAME</code><br><code>--${prefix}.amqpHostname</code></td>
+<td align="left"><code>${PREFIX}_AMQPHOSTNAME</code><br><code>--${prefix}.amqpHostname</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
 <td align="left">The name to use as the <em>hostname</em> in the client&rsquo;s AMQP <em>open</em> frame during connection establishment. This variable can be used to indicate the <em>virtual host</em> to connect to on the server.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_CERT_PATH</code><br><code>--${prefix}.certPath</code></td>
+<td align="left"><code>${PREFIX}_CERTPATH</code><br><code>--${prefix}.certPath</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
-<td align="left">The absolute path to the PEM file containing the certificate that the client should use for authenticating to the server. This variable must be used in conjunction with <code>${PREFIX}_KEY_PATH</code>.<br>Alternatively, the <code>${PREFIX}_KEY_STORE_PATH</code> variable can be used to configure a key store containing both the key as well as the certificate.</td>
+<td align="left">The absolute path to the PEM file containing the certificate that the client should use for authenticating to the server. This variable must be used in conjunction with <code>${PREFIX}_KEY_PATH</code>.<br>Alternatively, the <code>${PREFIX}_KEYSTOREPATH</code> variable can be used to configure a key store containing both the key as well as the certificate.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_CONNECT_TIMEOUT</code><br><code>--${prefix}.connectTimeout</code></td>
+<td align="left"><code>${PREFIX}_CONNECTTIMEOUT</code><br><code>--${prefix}.connectTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>5000</code></td>
 <td align="left">The maximum amount of time (milliseconds) that the client should wait for the AMQP connection to be opened. This includes the time for TCP/TLS connection establishment, SASL handshake and exchange of the AMQP <em>open</em> frame. This property can be used to tune the time period to wait according to the network latency involved with the connection between the client and the service.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_CREDENTIALS_PATH</code><br><code>--${prefix}.credentialsPath</code></td>
+<td align="left"><code>${PREFIX}_CREDENTIALSPATH</code><br><code>--${prefix}.credentialsPath</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
 <td align="left">The absolute path to a properties file that contains a <em>username</em> and a <em>password</em> property to use for authenticating to the service.<br>This variable is an alternative to using <code>${PREFIX}_USERNAME</code> and <code>${PREFIX}_PASSWORD</code> which has the advantage of not needing to expose the secret (password) in the client process&rsquo; environment.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_FLOW_LATENCY</code><br><code>--${prefix}.flowLatency</code></td>
+<td align="left"><code>${PREFIX}_FLOWLATENCY</code><br><code>--${prefix}.flowLatency</code></td>
 <td align="center">no</td>
 <td align="left"><code>20</code></td>
 <td align="left">The maximum amount of time (milliseconds) that the client should wait for <em>credits</em> after a link to the service has been established.</td>
@@ -1473,49 +1542,49 @@
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_HOSTNAME_VERIFICATION_REQUIRED</code><br><code>--${prefix}.hostnameVerificationRequired</code></td>
+<td align="left"><code>${PREFIX}_HOSTNAMEVERIFICATIONREQUIRED</code><br><code>--${prefix}.hostnameVerificationRequired</code></td>
 <td align="center">no</td>
 <td align="left"><code>true</code></td>
 <td align="left">A flag indicating whether the value of the <code>${PREFIX}_HOST</code> variable must match the <em>distinguished name</em> or any of the <em>alternative names</em> asserted by the server&rsquo;s certificate when connecting using TLS.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_IDLE_TIMEOUT</code><br><code>--${prefix}.idleTimeout</code></td>
+<td align="left"><code>${PREFIX}_IDLETIMEOUT</code><br><code>--${prefix}.idleTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>16000</code></td>
 <td align="left">Sets the amount of time in milliseconds after which a connection will be closed when no frames have been received from the remote peer. This property is also used to configure a heartbeat mechanism, checking that the connection is still alive. The corresponding heartbeat interval will be set to <em>idleTimeout/2</em> ms.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_INITIAL_CREDITS</code><br><code>--${prefix}.initialCredits</code></td>
+<td align="left"><code>${PREFIX}_INITIALCREDITS</code><br><code>--${prefix}.initialCredits</code></td>
 <td align="center">no</td>
 <td align="left"><code>200</code></td>
 <td align="left">The number of <em>credits</em> that a consuming client will initially issue to the service (sender) after link creation. This value effectively limits the number of messages that can be <em>in flight</em> unsettled.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_KEY_PATH</code><br><code>--${prefix}.keyPath</code></td>
+<td align="left"><code>${PREFIX}_KEYPATH</code><br><code>--${prefix}.keyPath</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
-<td align="left">The absolute path to the (PKCS8) PEM file containing the private key that the client should use for authenticating to the server. Note that the private key is not protected by a password. You should therefore make sure that the key file can only be read by the user that the client process is running under. This variable must be used in conjunction with <code>${PREFIX}_CERT_PATH</code>. Alternatively, the <code>${PREFIX}_KEY_STORE_PATH</code> variable can be used to configure a key store containing both the key as well as the certificate.</td>
+<td align="left">The absolute path to the (PKCS8) PEM file containing the private key that the client should use for authenticating to the server. Note that the private key is not protected by a password. You should therefore make sure that the key file can only be read by the user that the client process is running under. This variable must be used in conjunction with <code>${PREFIX}_CERTPATH</code>. Alternatively, the <code>${PREFIX}_KEYSTOREPATH</code> variable can be used to configure a key store containing both the key as well as the certificate.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_KEY_STORE_PASSWORD</code><br><code>--${prefix}.keyStorePassword</code></td>
+<td align="left"><code>${PREFIX}_KEYSTOREPASSWORD</code><br><code>--${prefix}.keyStorePassword</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
 <td align="left">The password required to read the contents of the key store.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_KEY_STORE_PATH</code><br><code>--${prefix}.keyStorePath</code></td>
+<td align="left"><code>${PREFIX}_KEYSTOREPATH</code><br><code>--${prefix}.keyStorePath</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
-<td align="left">The absolute path to the Java key store containing the private key and certificate that the client should use for authenticating to the server. Either this variable or the <code>${PREFIX}_KEY_PATH</code> and <code>${PREFIX}_CERT_PATH</code> variables need to be set in order to enable <em>SASL External</em> based authentication to the server. The key store format can be either <code>JKS</code> or <code>PKCS12</code> indicated by a <code>.jks</code> or <code>.p12</code> file suffix respectively.</td>
+<td align="left">The absolute path to the Java key store containing the private key and certificate that the client should use for authenticating to the server. Either this variable or the <code>${PREFIX}_KEYPATH</code> and <code>${PREFIX}_CERTPATH</code> variables need to be set in order to enable <em>SASL External</em> based authentication to the server. The key store format can be either <code>JKS</code> or <code>PKCS12</code> indicated by a <code>.jks</code> or <code>.p12</code> file suffix respectively.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_LINK_ESTABLISMENT_TIMEOUT</code><br><code>--${prefix}.linkEstablishmentTimeout</code></td>
+<td align="left"><code>${PREFIX}_LINKESTABLISMENTTIMEOUT</code><br><code>--${prefix}.linkEstablishmentTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>1000</code></td>
 <td align="left">The maximum amount of time (milliseconds) that the client should wait for the service&rsquo;s <em>attach</em> frame during link establishment. This property can be used to tune the time period to wait according to the network latency involved with the communication link between the client and the service.</td>
@@ -1529,20 +1598,6 @@
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_PORT</code><br><code>--${prefix}.port</code></td>
-<td align="center">no</td>
-<td align="left"><code>5671</code></td>
-<td align="left">The port that the service is listening on.</td>
-</tr>
-
-<tr>
-<td align="left"><code>${PREFIX}_USERNAME</code><br><code>--${prefix}.username</code></td>
-<td align="center">no</td>
-<td align="left">-</td>
-<td align="left">The username to use for authenticating to the service. This property (and the corresponding <em>password</em>) needs to be set in order to enable <em>SASL Plain</em> based authentication to the service.</td>
-</tr>
-
-<tr>
 <td align="left"><code>${PREFIX}_PASSWORD</code><br><code>--${prefix}.password</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
@@ -1550,81 +1605,88 @@
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_SEND_MESSAGE_TIMEOUT</code><br><code>--${prefix}.sendMessageTimeout</code></td>
+<td align="left"><code>${PREFIX}_PORT</code><br><code>--${prefix}.port</code></td>
+<td align="center">no</td>
+<td align="left"><code>5671</code></td>
+<td align="left">The port that the service is listening on.</td>
+</tr>
+
+<tr>
+<td align="left"><code>${PREFIX}_SENDMESSAGETIMEOUT</code><br><code>--${prefix}.sendMessageTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>1000</code></td>
 <td align="left">The maximum number of milliseconds to wait for a delivery update after an event or command message was sent before the send operation is failed. Setting this value to a higher value increases the chance of successful service invocation in situations where network latency is high.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RECONNECT_ATTEMPTS</code><br><code>--${prefix}.reconnectAttempts</code></td>
+<td align="left"><code>${PREFIX}_RECONNECTATTEMPTS</code><br><code>--${prefix}.reconnectAttempts</code></td>
 <td align="center">no</td>
 <td align="left"><code>-1</code></td>
 <td align="left">The number of attempts (in addition to the original connection attempt) that the client should make in order to establish an AMQP connection with the peer before giving up. The default value of this property is -1 which means that the client will try forever.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RECONNECT_DELAY_INCREMENT</code><br><code>--${prefix}.reconnectDelayIncrement</code></td>
+<td align="left"><code>${PREFIX}_RECONNECTDELAYINCREMENT</code><br><code>--${prefix}.reconnectDelayIncrement</code></td>
 <td align="center">no</td>
 <td align="left"><code>100</code></td>
-<td align="left">The factor (milliseconds) used in the exponential backoff algorithm for determining the delay before trying to re-establish an AMQP connection with the peer. The delay after an initial, failed connection attempt will be the value of the <code>${PREFIX}_RECONNECT_MIN_DELAY</code> variable. Each subsequent connection attempt will use a random delay between the minimum delay and the value determined by exponentially increasing the delay by the <code>${PREFIX}_RECONNECT_DELAY_INCREMENT</code> factor. The overall limit of the delay time is defined by the <code>${PREFIX}_RECONNECT_MAX_DELAY</code> variable.</td>
+<td align="left">The factor (milliseconds) used in the exponential backoff algorithm for determining the delay before trying to re-establish an AMQP connection with the peer. The delay after an initial, failed connection attempt will be the value of the <code>${PREFIX}_RECONNECTMINDELAY</code> variable. Each subsequent connection attempt will use a random delay between the minimum delay and the value determined by exponentially increasing the delay by the <code>${PREFIX}_RECONNECTDELAYINCREMENT</code> factor. The overall limit of the delay time is defined by the <code>${PREFIX}_RECONNECTMAXDELAY</code> variable.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RECONNECT_MAX_DELAY</code><br><code>--${prefix}.reconnectMaxDelay</code></td>
+<td align="left"><code>${PREFIX}_RECONNECTMAXDELAY</code><br><code>--${prefix}.reconnectMaxDelay</code></td>
 <td align="center">no</td>
 <td align="left"><code>7000</code></td>
 <td align="left">The maximum number of milliseconds to wait before trying to re-establish an AMQP connection with the peer.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RECONNECT_MIN_DELAY</code><br><code>--${prefix}.reconnectMinDelay</code></td>
+<td align="left"><code>${PREFIX}_RECONNECTMINDELAY</code><br><code>--${prefix}.reconnectMinDelay</code></td>
 <td align="center">no</td>
 <td align="left"><code>0</code></td>
 <td align="left">The minimum number of milliseconds to wait before trying to re-establish an AMQP connection with the peer.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_REQUEST_TIMEOUT</code><br><code>--${prefix}.requestTimeout</code></td>
+<td align="left"><code>${PREFIX}_REQUESTTIMEOUT</code><br><code>--${prefix}.requestTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>200</code></td>
 <td align="left">The maximum number of milliseconds to wait for a response before a service invocation is failed. Setting this value to a higher value increases the chance of successful service invocation in situations where network latency is high.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_SECURE_PROTOCOLS</code><br><code>--${prefix}.secureProtocols</code></td>
+<td align="left"><code>${PREFIX}_SECUREPROTOCOLS</code><br><code>--${prefix}.secureProtocols</code></td>
 <td align="center">no</td>
 <td align="left"><code>TLSv1.2</code></td>
 <td align="left">A (comma separated) list of secure protocols that are supported when negotiating TLS sessions. Please refer to the <a href="https://vertx.io/docs/vertx-core/java/#ssl">vert.x documentation</a> for a list of supported protocol names.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_TLS_ENABLED</code><br><code>--${prefix}.tlsEnabled</code></td>
+<td align="left"><code>${PREFIX}_TLSENABLED</code><br><code>--${prefix}.tlsEnabled</code></td>
 <td align="center">no</td>
 <td align="left"><code>false</code></td>
-<td align="left">If set to <code>true</code> the connection to the peer will be encrypted using TLS and the peer&rsquo;s identity will be verified using the JVM&rsquo;s configured standard trust store.<br>This variable only needs to be set to enable TLS explicitly if no specific trust store is configured using the <code>${PREFIX}_TRUST_STORE_PATH</code> variable.</td>
+<td align="left">If set to <code>true</code> the connection to the peer will be encrypted using TLS and the peer&rsquo;s identity will be verified using the JVM&rsquo;s configured standard trust store.<br>This variable only needs to be set to enable TLS explicitly if no specific trust store is configured using the <code>${PREFIX}_TRUSTSTOREPATH</code> variable.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_SNI_SERVER_NAME</code><br><code>--${prefix}.SniServerName</code></td>
-<td align="center">no</td>
-<td align="left">-</td>
-<td align="left">Explicitly override the host to use for the TLS SNI server name. If SNI server name is not specified, the host from <code>${PREFIX}_HOST</code> will be used with SNI.</td>
-</tr>
-
-<tr>
-<td align="left"><code>${PREFIX}_TRUST_STORE_PATH</code><br><code>--${prefix}.trustStorePath</code></td>
+<td align="left"><code>${PREFIX}_TRUSTSTOREPATH</code><br><code>--${prefix}.trustStorePath</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
 <td align="left">The absolute path to the Java key store containing the CA certificates the adapter uses for authenticating the service. This property <strong>must</strong> be set if the service has been configured to support TLS. The key store format can be either <code>JKS</code>, <code>PKCS12</code> or <code>PEM</code> indicated by a <code>.jks</code>, <code>.p12</code> or <code>.pem</code> file suffix respectively.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_TRUST_STORE_PASSWORD</code><br><code>--${prefix}.trustStorePassword</code></td>
+<td align="left"><code>${PREFIX}_TRUSTSTOREPASSWORD</code><br><code>--${prefix}.trustStorePassword</code></td>
 <td align="center">no</td>
 <td align="left">-</td>
 <td align="left">The password required to read the contents of the trust store.</td>
 </tr>
+
+<tr>
+<td align="left"><code>${PREFIX}_USERNAME</code><br><code>--${prefix}.username</code></td>
+<td align="center">no</td>
+<td align="left">-</td>
+<td align="left">The username to use for authenticating to the service. This property (and the corresponding <em>password</em>) needs to be set in order to enable <em>SASL Plain</em> based authentication to the service.</td>
+</tr>
 </tbody>
 </table>
 
@@ -1637,7 +1699,7 @@
 <ol>
 <li>If the response contains a <code>no-cache</code> directive, the response is not cached at all.</li>
 <li>Otherwise, if the response contains a <code>max-age</code> directive, the response is cached for the number of seconds specified by the directive.</li>
-<li>Otherwise, if the response message does not contain any of the above directives and the response&rsquo;s status code is one of the codes defined in <a href="https://tools.ietf.org/html/rfc2616#section-13.4">RFC 2616, Section 13.4 Response Cacheability</a>, the response is put to the cache using the default timeout defined by the <code>${PREFIX}_RESPONSE_CACHE_DEFAULT_TIMEOUT</code> variable as the maximum age.</li>
+<li>Otherwise, if the response message does not contain any of the above directives and the response&rsquo;s status code is one of the codes defined in <a href="https://tools.ietf.org/html/rfc2616#section-13.4">RFC 2616, Section 13.4 Response Cacheability</a>, the response is put to the cache using the default timeout defined by the <code>${PREFIX}_RESPONSECACHEDEFAULTTIMEOUT</code> variable as the maximum age.</li>
 </ol>
 
 <p>The following table provides an overview of the configuration variables and corresponding command line options for configuring the Hono client&rsquo;s caching behavior.</p>
@@ -1654,21 +1716,21 @@
 
 <tbody>
 <tr>
-<td align="left"><code>${PREFIX}_RESPONSE_CACHE_MIN_SIZE</code><br><code>--${prefix}.responseCacheMinSize</code></td>
+<td align="left"><code>${PREFIX}_RESPONSECACHEMINSIZE</code><br><code>--${prefix}.responseCacheMinSize</code></td>
 <td align="center">no</td>
 <td align="left"><code>20</code></td>
 <td align="left">The minimum number of responses that can be cached.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RESPONSE_CACHE_MAX_SIZE</code><br><code>--${prefix}.responseCacheMaxSize</code></td>
+<td align="left"><code>${PREFIX}_RESPONSECACHEMAXSIZE</code><br><code>--${prefix}.responseCacheMaxSize</code></td>
 <td align="center">no</td>
 <td align="left"><code>1000</code></td>
 <td align="left">The maximum number of responses that can be cached. It is up to the particular cache implementation, how to deal with new cache entries once this limit has been reached.</td>
 </tr>
 
 <tr>
-<td align="left"><code>${PREFIX}_RESPONSE_CACHE_DEFAULT_TIMEOUT</code><br><code>--${prefix}.responseCacheDefaultTimeout</code></td>
+<td align="left"><code>${PREFIX}_RESPONSECACHEDEFAULTTIMEOUT</code><br><code>--${prefix}.responseCacheDefaultTimeout</code></td>
 <td align="center">no</td>
 <td align="left"><code>600</code></td>
 <td align="left">The default number of seconds after which cached responses should be considered invalid.</td>
@@ -1685,11 +1747,11 @@
 <li>(optionally) authenticating to the server using a client certificate (if the server supports this)</li>
 </ul>
 
-<p>In order to authenticate the server by means of the server&rsquo;s certificate, the factory needs to be configured with a <em>trust anchor</em> containing the <em>certificate authorities</em> that the client trusts. The trust anchor can be configured explicitly by means of the <code>${PREFIX}_TRUST_STORE_PATH</code> and <code>${PREFIX}_TRUST_STORE_PASSWORD</code> variables. This is most useful in cases where the server&rsquo;s certificate has not been signed by one of the public root CAs that are contained in the JRE&rsquo;s standard trust store. However, if the server does use a certificate signed by such a public CA, then it is sufficient to set the <code>${PREFIX}_TLS_ENABLED</code> variable to <code>true</code> in order for the client to support TLS when connecting to the server.</p>
+<p>In order to authenticate the server by means of the server&rsquo;s certificate, the factory needs to be configured with a <em>trust anchor</em> containing the <em>certificate authorities</em> that the client trusts. The trust anchor can be configured explicitly by means of the <code>${PREFIX}_TRUSTSTOREPATH</code> and <code>${PREFIX}_TRUSTSTOREPASSWORD</code> variables. This is most useful in cases where the server&rsquo;s certificate has not been signed by one of the public root CAs that are contained in the JRE&rsquo;s standard trust store. However, if the server does use a certificate signed by such a public CA, then it is sufficient to set the <code>${PREFIX}_TLSENABLED</code> variable to <code>true</code> in order for the client to support TLS when connecting to the server.</p>
 
-<p>The client can also be configured to authenticate to the server by means of an X.509 client certificate if the server is configured to support this. The <code>${PREFIX}_CERT_PATH</code> and <code>${PREFIX}_KEY_PATH</code> variables can be used to set the paths to PEM files containing the certificate and private key. Alternatively, the <code>${PREFIX}_KEY_STORE_PATH</code> and <code>${PREFIX}_KEY_STORE_PASSWORD</code> variables can be used to set the path and password of a key store which contains both the certificate as well as the private key.</p>
+<p>The client can also be configured to authenticate to the server by means of an X.509 client certificate if the server is configured to support this. The <code>${PREFIX}_CERTPATH</code> and <code>${PREFIX}_KEYPATH</code> variables can be used to set the paths to PEM files containing the certificate and private key. Alternatively, the <code>${PREFIX}_KEYSTOREPATH</code> and <code>${PREFIX}_KEYSTOREPASSWORD</code> variables can be used to set the path and password of a key store which contains both the certificate as well as the private key.</p>
 
-<p>The factory supports TLS 1.2 only by default for negotiating TLS sessions with servers. Additional protocols can be enabled by setting the <code>${PREFIX}_SECURE_PROTOCOLS</code> variable to a comma separated list of protocol names as defined in the <a href="https://vertx.io/docs/vertx-core/java/#ssl">vert.x documentation</a>. However, great care should be taken when enabling older protocols because most of them are vulnerable to attacks.</p>
+<p>The factory supports TLS 1.2 only by default for negotiating TLS sessions with servers. Additional protocols can be enabled by setting the <code>${PREFIX}_SECUREPROTOCOLS</code> variable to a comma separated list of protocol names as defined in the <a href="https://vertx.io/docs/vertx-core/java/#ssl">vert.x documentation</a>. However, great care should be taken when enabling older protocols because most of them are vulnerable to attacks.</p>
 
 <footer class=" footline" >
 	
@@ -1994,6 +2056,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2274,6 +2352,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2596,20 +2690,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/http-adapter-config/index.html b/docs/admin-guide/http-adapter-config/index.html
index dfb6404..3e81906 100644
--- a/docs/admin-guide/http-adapter-config/index.html
+++ b/docs/admin-guide/http-adapter-config/index.html
@@ -21,19 +21,19 @@
     <title>HTTP Adapter Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/http-adapter-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/http-adapter-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/http-adapter-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/http-adapter-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/http-adapter-config/">dev</option>
@@ -1924,6 +1984,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2204,6 +2280,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2526,20 +2618,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/index.html b/docs/admin-guide/index.html
index 39c8e0f..9641931 100644
--- a/docs/admin-guide/index.html
+++ b/docs/admin-guide/index.html
@@ -21,19 +21,19 @@
     <title>Admin Guide :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/">dev</option>
@@ -1695,6 +1755,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -1971,6 +2047,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2293,20 +2385,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/kura-adapter-config/index.html b/docs/admin-guide/kura-adapter-config/index.html
index 4de5f80..3fb1431 100644
--- a/docs/admin-guide/kura-adapter-config/index.html
+++ b/docs/admin-guide/kura-adapter-config/index.html
@@ -21,19 +21,19 @@
     <title>Kura Adapter Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/kura-adapter-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/kura-adapter-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/kura-adapter-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/kura-adapter-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/kura-adapter-config/">dev</option>
@@ -1938,6 +1998,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2218,6 +2294,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2540,20 +2632,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/monitoring-tracing-config/index.html b/docs/admin-guide/monitoring-tracing-config/index.html
index 8a561b2..17dcd24 100644
--- a/docs/admin-guide/monitoring-tracing-config/index.html
+++ b/docs/admin-guide/monitoring-tracing-config/index.html
@@ -21,19 +21,19 @@
     <title>Monitoring & Tracing :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/monitoring-tracing-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/monitoring-tracing-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/monitoring-tracing-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/monitoring-tracing-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/monitoring-tracing-config/">dev</option>
@@ -1920,6 +1980,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2200,6 +2276,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2522,20 +2614,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/mqtt-adapter-config/index.html b/docs/admin-guide/mqtt-adapter-config/index.html
index f688d53..0a3ab16 100644
--- a/docs/admin-guide/mqtt-adapter-config/index.html
+++ b/docs/admin-guide/mqtt-adapter-config/index.html
@@ -21,19 +21,19 @@
     <title>MQTT Adapter Configuration :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/mqtt-adapter-config/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/mqtt-adapter-config/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/mqtt-adapter-config/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/mqtt-adapter-config/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/mqtt-adapter-config/">dev</option>
@@ -1931,6 +1991,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2211,6 +2287,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2533,20 +2625,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/admin-guide/secure_communication/index.html b/docs/admin-guide/secure_communication/index.html
index 0ec9ab0..a4e1eb8 100644
--- a/docs/admin-guide/secure_communication/index.html
+++ b/docs/admin-guide/secure_communication/index.html
@@ -21,19 +21,19 @@
     <title>Secure Communication :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1585016613" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1585016613" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1585103011" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1585103011" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1585016613" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1585103011" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1585016613"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1585103011"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585016613"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1585103011"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1585103011"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1585016613"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1585103011"></script>
 
     
   </div>
@@ -391,6 +391,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/user-guide/coap-adapter/" title="CoAP Adapter" class="dd-item ">
+        <a href="/hono/docs/user-guide/coap-adapter/">
+        CoAP Adapter
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/user-guide/kura-adapter/" title="Kura Adapter" class="dd-item ">
         <a href="/hono/docs/user-guide/kura-adapter/">
         Kura Adapter
@@ -759,6 +778,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/dev-guide/amqp_adapter_client/" title="AMQP Adapter Client for Java" class="dd-item ">
+        <a href="/hono/docs/dev-guide/amqp_adapter_client/">
+        AMQP Adapter Client for Java
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/dev-guide/java_client_consumer/" title="Consuming Messages from Java" class="dd-item ">
         <a href="/hono/docs/dev-guide/java_client_consumer/">
         Consuming Messages from Java
@@ -1239,7 +1277,25 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/admin-guide/secure_communication/" selected>stable (1.1)</option>
+                      <option id="stable" value="/hono/docs/admin-guide/secure_communication/" selected>stable (1.2)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.1" value="/hono/docs/1.1/admin-guide/secure_communication/">1.1</option>
                     
                   
               
@@ -1253,6 +1309,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/admin-guide/secure_communication/">1.0</option>
@@ -1269,6 +1327,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/admin-guide/secure_communication/">dev</option>
@@ -2048,6 +2108,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2328,6 +2404,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2650,20 +2742,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585016613"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585016613"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1585016613"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1585016613"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585016613"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1585016613"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1585103011"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1585103011"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1585103011"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1585103011"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1585103011"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1585103011"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1585016613"></script>
-    <script src="/hono/docs/js/learn.js?1585016613"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1585016613"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1585103011"></script>
+    <script src="/hono/docs/js/learn.js?1585103011"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1585103011"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1585016613" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1585016613"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1585103011" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1585103011"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>