diff --git a/docs/concepts/command-and-control/index.html b/docs/concepts/command-and-control/index.html
index 01f19f9..6a13332 100644
--- a/docs/concepts/command-and-control/index.html
+++ b/docs/concepts/command-and-control/index.html
@@ -21,19 +21,19 @@
     <title>Command & Control :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,12 +1346,36 @@
               
                   
               
+                  
+              
           
               
               
                   
               
                   
+                    
+                    
+                      <option id="1.3" value="/hono/docs/1.3/concepts/command-and-control/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
               
                   
               
@@ -2642,20 +2666,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/command_control_concept.svg b/docs/concepts/command_control_concept.svg
index 6c4041d..594d2cd 100644
--- a/docs/concepts/command_control_concept.svg
+++ b/docs/concepts/command_control_concept.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="669.6px" preserveAspectRatio="none" style="width:1050px;height:669px;" version="1.1" viewBox="0 0 1050 669" width="1050px" zoomAndPan="magnify"><defs><filter height="300%" id="fngzrirs0jsbq" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="414.7125" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="472.2" y="177.3937"/><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="332.7938" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="912.6" y="259.3125"/><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="137.4375" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="131.475"/><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="208.7156" style="stroke: #000000; stroke-width: 2.4;" width="938.4" x="98.4" y="285.7125"/><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="90.4781" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="511.2281"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="148.8" x2="148.8" y1="45.9563" y2="622.1062"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="478.2" x2="478.2" y1="45.9563" y2="622.1062"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="918" x2="918" y1="45.9563" y2="622.1062"/><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="27.5941">Device</text><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="644.9004">Device</text><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="373.8" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="382.2" y="27.5941">Hono Protocol Adapter</text><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="373.8" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="382.2" y="644.9004">Hono Protocol Adapter</text><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="862.8" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="871.2" y="27.5941">Application</text><rect fill="#FEFECE" filter="url(#fngzrirs0jsbq)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="862.8" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="871.2" y="644.9004">Application</text><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="414.7125" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="472.2" y="177.3937"/><rect fill="#FFFFFF" filter="url(#fngzrirs0jsbq)" height="332.7938" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="912.6" y="259.3125"/><path d="M9.6,63.9563 L9.6,111.9563 L285.6,111.9563 L285.6,75.9563 L273.6,63.9563 L9.6,63.9563 " fill="#FBFB77" filter="url(#fngzrirs0jsbq)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M273.6,63.9563 L273.6,75.9563 L285.6,75.9563 L273.6,63.9563 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="217.2" x="16.8" y="84.4365">The device is connected and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="250.8" x="16.8" y="102.5959">authenticated with TENANT/4711</text><path d="M98.4,131.475 L357.6,131.475 L357.6,139.875 L345.6,151.875 L98.4,151.875 L98.4,131.475 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="137.4375" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="131.475"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="116.4" y="147.1553">Command subscription</text><polygon fill="#A80036" points="457.8,172.5938,469.8,177.3937,457.8,182.1938,462.6,177.3937" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="465" y1="177.3937" y2="177.3937"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="171.3146">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="284.4" x="173.4" y="171.3146">Command subscription / TTD request</text><path d="M273.6,192.9938 L273.6,222.9938 L678,222.9938 L678,204.9938 L666,192.9938 L273.6,192.9938 " fill="#FBFB77" filter="url(#fngzrirs0jsbq)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M666,192.9938 L666,204.9938 L678,204.9938 L666,192.9938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="379.2" x="280.8" y="213.474">Ensure Command consumer link for tenant exists</text><polygon fill="#A80036" points="898.2,254.5125,910.2,259.3125,898.2,264.1125,903,259.3125" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="484.2" x2="905.4" y1="259.3125" y2="259.3125"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="492.6" y="253.2334">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="350.4" x="508.2" y="253.2334">transfer("event/TENANT","4711","ttd=${ttd}")</text><path d="M98.4,285.7125 L325.2,285.7125 L325.2,294.1125 L313.2,306.1125 L98.4,306.1125 L98.4,285.7125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="208.7156" style="stroke: #000000; stroke-width: 2.4;" width="938.4" x="98.4" y="285.7125"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="116.4" y="301.3928">Command handling</text><path d="M812.4,312.2719 L812.4,360.2719 L1020,360.2719 L1020,324.2719 L1008,312.2719 L812.4,312.2719 " fill="#FBFB77" filter="url(#fngzrirs0jsbq)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M1008,312.2719 L1008,324.2719 L1020,324.2719 L1008,312.2719 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="819.6" y="332.7521">Create sender link and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="182.4" x="819.6" y="350.9115">response consumer link</text><polygon fill="#A80036" points="497.4,410.1094,485.4,414.9094,497.4,419.7094,492.6,414.9094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="490.2" x2="911.4" y1="414.9094" y2="414.9094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="504.6" y="399.7506">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="226.8" x="520.2" y="390.6709">transfer("command/TENANT",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="525" y="408.8303">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="162.6,445.0687,150.6,449.8688,162.6,454.6688,157.8,449.8688" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="155.4" x2="471" y1="449.8688" y2="449.8688"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="169.8" y="443.7896">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="249.6" x="185.4" y="443.7896">Command is published to device</text><polygon fill="#A80036" points="898.2,480.0281,910.2,484.8281,898.2,489.6281,903,484.8281" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="484.2" x2="905.4" y1="484.8281" y2="484.8281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="492.6" y="478.749">5</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="176.4" x="508.2" y="478.749">disposition("accepted")</text><path d="M98.4,511.2281 L412.8,511.2281 L412.8,519.6281 L400.8,531.6281 L98.4,531.6281 L98.4,511.2281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="90.4781" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="511.2281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="260.4" x="116.4" y="526.9084">Command response handling</text><polygon fill="#A80036" points="457.8,552.3469,469.8,557.1469,457.8,561.9469,462.6,557.1469" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="465" y1="557.1469" y2="557.1469"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="551.0678">6</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="260.4" x="173.4" y="551.0678">Device sends command response</text><polygon fill="#A80036" points="904.2,587.3063,916.2,592.1062,904.2,596.9063,909,592.1062" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="478.2" x2="911.4" y1="592.1062" y2="592.1062"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="486.6" y="586.0271">7</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="384" x="502.2" y="586.0271">transfer("${reply-to}","status=200","${payload}")</text><!--MD5=[e0e07f50b6ca463e3c049d624b0d9900]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="669.6px" preserveAspectRatio="none" style="width:1050px;height:669px;" version="1.1" viewBox="0 0 1050 669" width="1050px" zoomAndPan="magnify"><defs><filter height="300%" id="f1eh1at6g9lzf2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="414.7125" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="472.2" y="177.3937"/><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="332.7938" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="912.6" y="259.3125"/><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="137.4375" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="131.475"/><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="208.7156" style="stroke: #000000; stroke-width: 2.4;" width="938.4" x="98.4" y="285.7125"/><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="90.4781" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="511.2281"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="148.8" x2="148.8" y1="45.9563" y2="622.1062"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="478.2" x2="478.2" y1="45.9563" y2="622.1062"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="918" x2="918" y1="45.9563" y2="622.1062"/><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="27.5941">Device</text><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="644.9004">Device</text><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="373.8" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="382.2" y="27.5941">Hono Protocol Adapter</text><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="373.8" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="382.2" y="644.9004">Hono Protocol Adapter</text><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="862.8" y="3.6"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="871.2" y="27.5941">Application</text><rect fill="#FEFECE" filter="url(#f1eh1at6g9lzf2)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="862.8" y="620.9063"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="871.2" y="644.9004">Application</text><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="414.7125" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="472.2" y="177.3937"/><rect fill="#FFFFFF" filter="url(#f1eh1at6g9lzf2)" height="332.7938" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="912.6" y="259.3125"/><path d="M9.6,63.9563 L9.6,111.9563 L285.6,111.9563 L285.6,75.9563 L273.6,63.9563 L9.6,63.9563 " fill="#FBFB77" filter="url(#f1eh1at6g9lzf2)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M273.6,63.9563 L273.6,75.9563 L285.6,75.9563 L273.6,63.9563 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="217.2" x="16.8" y="84.4365">The device is connected and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="250.8" x="16.8" y="102.5959">authenticated with TENANT/4711</text><path d="M98.4,131.475 L357.6,131.475 L357.6,139.875 L345.6,151.875 L98.4,151.875 L98.4,131.475 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="137.4375" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="131.475"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="116.4" y="147.1553">Command subscription</text><polygon fill="#A80036" points="457.8,172.5938,469.8,177.3937,457.8,182.1938,462.6,177.3937" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="465" y1="177.3937" y2="177.3937"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="171.3146">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="284.4" x="173.4" y="171.3146">Command subscription / TTD request</text><path d="M315.6,192.9938 L315.6,222.9938 L634.8,222.9938 L634.8,204.9938 L622.8,192.9938 L315.6,192.9938 " fill="#FBFB77" filter="url(#f1eh1at6g9lzf2)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M622.8,192.9938 L622.8,204.9938 L634.8,204.9938 L622.8,192.9938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="294" x="322.8" y="213.474">Command consumer links are created</text><polygon fill="#A80036" points="898.2,254.5125,910.2,259.3125,898.2,264.1125,903,259.3125" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="484.2" x2="905.4" y1="259.3125" y2="259.3125"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="492.6" y="253.2334">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="350.4" x="508.2" y="253.2334">transfer("event/TENANT","4711","ttd=${ttd}")</text><path d="M98.4,285.7125 L325.2,285.7125 L325.2,294.1125 L313.2,306.1125 L98.4,306.1125 L98.4,285.7125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="208.7156" style="stroke: #000000; stroke-width: 2.4;" width="938.4" x="98.4" y="285.7125"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="116.4" y="301.3928">Command handling</text><path d="M812.4,312.2719 L812.4,360.2719 L1020,360.2719 L1020,324.2719 L1008,312.2719 L812.4,312.2719 " fill="#FBFB77" filter="url(#f1eh1at6g9lzf2)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M1008,312.2719 L1008,324.2719 L1020,324.2719 L1008,312.2719 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="819.6" y="332.7521">Create sender link and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="182.4" x="819.6" y="350.9115">response consumer link</text><polygon fill="#A80036" points="497.4,410.1094,485.4,414.9094,497.4,419.7094,492.6,414.9094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="490.2" x2="911.4" y1="414.9094" y2="414.9094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="504.6" y="399.7506">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="226.8" x="520.2" y="390.6709">transfer("command/TENANT",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="525" y="408.8303">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="162.6,445.0687,150.6,449.8688,162.6,454.6688,157.8,449.8688" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="155.4" x2="471" y1="449.8688" y2="449.8688"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="169.8" y="443.7896">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="249.6" x="185.4" y="443.7896">Command is published to device</text><polygon fill="#A80036" points="898.2,480.0281,910.2,484.8281,898.2,489.6281,903,484.8281" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="484.2" x2="905.4" y1="484.8281" y2="484.8281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="492.6" y="478.749">5</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="176.4" x="508.2" y="478.749">disposition("accepted")</text><path d="M98.4,511.2281 L412.8,511.2281 L412.8,519.6281 L400.8,531.6281 L98.4,531.6281 L98.4,511.2281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="90.4781" style="stroke: #000000; stroke-width: 2.4;" width="888" x="98.4" y="511.2281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="260.4" x="116.4" y="526.9084">Command response handling</text><polygon fill="#A80036" points="457.8,552.3469,469.8,557.1469,457.8,561.9469,462.6,557.1469" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="465" y1="557.1469" y2="557.1469"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="551.0678">6</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="260.4" x="173.4" y="551.0678">Device sends command response</text><polygon fill="#A80036" points="904.2,587.3063,916.2,592.1062,904.2,596.9063,909,592.1062" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="478.2" x2="911.4" y1="592.1062" y2="592.1062"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="486.6" y="586.0271">7</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="384" x="502.2" y="586.0271">transfer("${reply-to}","status=200","${payload}")</text><!--MD5=[143d5ea5a7b99b91c1366dbbd0bf0fec]
 @startuml
 scale 1.2
 
@@ -16,7 +16,7 @@
     Device -> "Hono Protocol Adapter": Command subscription / TTD request
     activate "Hono Protocol Adapter"
     note over "Hono Protocol Adapter"
-    Ensure Command consumer link for tenant exists
+    Command consumer links are created
     end note
     "Hono Protocol Adapter" -> Application: transfer("event/TENANT","4711","ttd=${ttd}")
     activate Application
diff --git a/docs/concepts/command_control_concept_delegate_1.svg b/docs/concepts/command_control_concept_delegate_1.svg
index a191e61..dfc24a9 100644
--- a/docs/concepts/command_control_concept_delegate_1.svg
+++ b/docs/concepts/command_control_concept_delegate_1.svg
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="495.6px" preserveAspectRatio="none" style="width:1159px;height:495px;" version="1.1" viewBox="0 0 1159 495" width="1159.2px" zoomAndPan="magnify"><defs><filter height="300%" id="f14y3nnq0zl06i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="469.7438" style="stroke: #A80036; stroke-width: 1.2;" width="544.8" x="286.8" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="536.4" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#f14y3nnq0zl06i)" height="142.2375" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="365.4" y="328.7063"/><rect fill="#FFFFFF" filter="url(#f14y3nnq0zl06i)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="1072.2" y="451.7438"/><rect fill="#FFFFFF" filter="url(#f14y3nnq0zl06i)" height="196.7156" style="stroke: #000000; stroke-width: 2.4;" width="1047.6" x="98.4" y="264.6281"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="148.8" x2="148.8" y1="89.6719" y2="481.7438"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="370.8" x2="370.8" y1="89.6719" y2="481.7438"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="542.4" x2="542.4" y1="89.6719" y2="481.7438"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="736.8" x2="736.8" y1="89.6719" y2="481.7438"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="924" x2="924" y1="89.6719" y2="481.7438"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="1077.6" x2="1077.6" y1="89.6719" y2="481.7438"/><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="71.3098">Device</text><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="154.8" x="291.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="138" x="300" y="51.7535">Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="100.8" x="318.6" y="71.3098">instance #1</text><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="154.8" x="463.2" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="138" x="471.6" y="51.7535">Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="100.8" x="490.2" y="71.3098">instance #2</text><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="174" x="648" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="656.4" y="51.7535">Device Connection</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="126" x="672" y="71.3098">API component</text><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="838.8" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="847.2" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="888.6" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#f14y3nnq0zl06i)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="1022.4" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="1030.8" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#f14y3nnq0zl06i)" height="142.2375" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="365.4" y="328.7063"/><rect fill="#FFFFFF" filter="url(#f14y3nnq0zl06i)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="1072.2" y="451.7438"/><polygon fill="#A80036" points="910.2,176.7094,922.2,181.5094,910.2,186.3094,915,181.5094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="543" x2="917.4" y1="181.5094" y2="181.5094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="551.4" y="148.1912">0</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="133.2" x="567" y="120.9521">Consumer link on</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="156" x="567" y="139.1115">"command/TENANT"</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="148.8" x="567" y="157.2709">created for another</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="92.4" x="567" y="175.4303">subscription</text><path d="M9.6,197.1094 L9.6,245.1094 L285.6,245.1094 L285.6,209.1094 L273.6,197.1094 L9.6,197.1094 " fill="#FBFB77" filter="url(#f14y3nnq0zl06i)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M273.6,197.1094 L273.6,209.1094 L285.6,209.1094 L273.6,197.1094 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="217.2" x="16.8" y="217.5896">The device is connected and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="250.8" x="16.8" y="235.749">authenticated with TENANT/4711</text><path d="M98.4,264.6281 L357.6,264.6281 L357.6,273.0281 L345.6,285.0281 L98.4,285.0281 L98.4,264.6281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="196.7156" style="stroke: #000000; stroke-width: 2.4;" width="1047.6" x="98.4" y="264.6281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="116.4" y="280.3084">Command subscription</text><polygon fill="#A80036" points="351,323.9063,363,328.7063,351,333.5062,355.8,328.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="358.2" y1="328.7063" y2="328.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="313.5475">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="177.6" x="173.4" y="304.4678">Command subscription</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="102" x="178.2" y="322.6271">/ TTD request</text><polygon fill="#A80036" points="910.2,358.8656,922.2,363.6656,910.2,368.4656,915,363.6656" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="917.4" y1="363.6656" y2="363.6656"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="357.5865">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="300" x="401.4" y="357.5865">attach("receiver", "command/TENANT")</text><polygon fill="#A80036" points="723,411.9844,735,416.7844,723,421.5844,727.8,416.7844" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="730.2" y1="416.7844" y2="416.7844"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="401.6256">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="401.4" y="392.5459">set command handling adapter instance</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="300" x="401.4" y="410.7053">for device 4711 to adapter instance #1</text><polygon fill="#A80036" points="1057.8,446.9437,1069.8,451.7438,1057.8,456.5438,1062.6,451.7438" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="1065" y1="451.7438" y2="451.7438"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="445.6646">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="585.6" x="401.4" y="445.6646">transfer("event/TENANT","4711","ttd=${ttd}")  via AMQP messaging network</text><!--MD5=[c8b432715fa26176d4dfd933528d308b]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="477.6px" preserveAspectRatio="none" style="width:1088px;height:477px;" version="1.1" viewBox="0 0 1088 477" width="1088.4px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hmhg3jewutza" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="451.5844" style="stroke: #A80036; stroke-width: 1.2;" width="439.2" x="262.2" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="459" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#f1hmhg3jewutza)" height="124.0781" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="365.4" y="328.7063"/><rect fill="#FFFFFF" filter="url(#f1hmhg3jewutza)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="1001.4" y="433.5844"/><rect fill="#FFFFFF" filter="url(#f1hmhg3jewutza)" height="178.5563" style="stroke: #000000; stroke-width: 2.4;" width="976.8" x="98.4" y="264.6281"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="148.8" x2="148.8" y1="89.6719" y2="463.5844"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="371.4" x2="371.4" y1="89.6719" y2="463.5844"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="592.2" x2="592.2" y1="89.6719" y2="463.5844"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="793.8" x2="793.8" y1="89.6719" y2="463.5844"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="1006.8" x2="1006.8" y1="89.6719" y2="463.5844"/><rect fill="#FEFECE" filter="url(#f1hmhg3jewutza)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="110.4" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="118.8" y="71.3098">Device</text><rect fill="#FEFECE" filter="url(#f1hmhg3jewutza)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="267" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="275.4" y="51.7535">Hono Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="86.4" x="325.8" y="71.3098">instance 1</text><rect fill="#FEFECE" filter="url(#f1hmhg3jewutza)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="487.8" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="496.2" y="51.7535">Hono Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="86.4" x="546.6" y="71.3098">instance 2</text><rect fill="#FEFECE" filter="url(#f1hmhg3jewutza)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="708.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="717" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="758.4" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#f1hmhg3jewutza)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="951.6" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="960" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#f1hmhg3jewutza)" height="124.0781" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="365.4" y="328.7063"/><rect fill="#FFFFFF" filter="url(#f1hmhg3jewutza)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="1001.4" y="433.5844"/><polygon fill="#A80036" points="780,176.7094,792,181.5094,780,186.3094,784.8,181.5094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="592.2" x2="787.2" y1="181.5094" y2="181.5094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="600.6" y="148.1912">0</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="133.2" x="616.2" y="120.9521">Consumer link on</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="156" x="616.2" y="139.1115">"command/TENANT"</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="148.8" x="616.2" y="157.2709">created for another</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="92.4" x="616.2" y="175.4303">subscription</text><path d="M9.6,197.1094 L9.6,245.1094 L285.6,245.1094 L285.6,209.1094 L273.6,197.1094 L9.6,197.1094 " fill="#FBFB77" filter="url(#f1hmhg3jewutza)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M273.6,197.1094 L273.6,209.1094 L285.6,209.1094 L273.6,197.1094 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="217.2" x="16.8" y="217.5896">The device is connected and</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="250.8" x="16.8" y="235.749">authenticated with TENANT/4711</text><path d="M98.4,264.6281 L357.6,264.6281 L357.6,273.0281 L345.6,285.0281 L98.4,285.0281 L98.4,264.6281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="178.5563" style="stroke: #000000; stroke-width: 2.4;" width="976.8" x="98.4" y="264.6281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="116.4" y="280.3084">Command subscription</text><polygon fill="#A80036" points="351,323.9063,363,328.7063,351,333.5062,355.8,328.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="149.4" x2="358.2" y1="328.7063" y2="328.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="157.8" y="313.5475">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="177.6" x="173.4" y="304.4678">Command subscription</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="102" x="178.2" y="322.6271">/ TTD request</text><polygon fill="#A80036" points="780,358.8656,792,363.6656,780,368.4656,784.8,363.6656" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="787.2" y1="363.6656" y2="363.6656"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="357.5865">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="300" x="401.4" y="357.5865">attach("receiver", "command/TENANT")</text><polygon fill="#A80036" points="780,393.825,792,398.625,780,403.425,784.8,398.625" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="787.2" y1="398.625" y2="398.625"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="392.5459">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="318" x="401.4" y="392.5459">attach("receiver", "control/TENANT/4711")</text><polygon fill="#A80036" points="987,428.7844,999,433.5844,987,438.3844,991.8,433.5844" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="377.4" x2="994.2" y1="433.5844" y2="433.5844"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="385.8" y="427.5053">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="585.6" x="401.4" y="427.5053">transfer("event/TENANT","4711","ttd=${ttd}")  via AMQP messaging network</text><!--MD5=[5ba83c9aca794515c9d86136c39b294c]
 @startuml
 scale 1.2
 hide footbox
 
 participant Device order 10
 box "Hono"
-    participant "Protocol Adapter\ninstance #1" order 30
-    participant "Protocol Adapter\ninstance #2" order 40
-    participant "Device Connection\nAPI component" order 50
+    participant "Hono Protocol Adapter\ninstance 1" order 30
+    participant "Hono Protocol Adapter\ninstance 2" order 40
 end box
 participant "AMQP messaging \nnetwork" order 60
 participant Application order 70
 
 autonumber 0
 
-"Protocol Adapter\ninstance #2" -> "AMQP messaging \nnetwork": Consumer link on \n"command/TENANT"\ncreated for another \nsubscription
+"Hono Protocol Adapter\ninstance 2" -> "AMQP messaging \nnetwork": Consumer link on \n"command/TENANT"\ncreated for another \nsubscription
 
 note over Device
 The device is connected and
@@ -23,13 +22,13 @@
 
 group Command subscription
 
-    Device -> "Protocol Adapter\ninstance #1": Command subscription\n / TTD request
-    activate "Protocol Adapter\ninstance #1"
+    Device -> "Hono Protocol Adapter\ninstance 1": Command subscription\n / TTD request
+    activate "Hono Protocol Adapter\ninstance 1"
 
-    "Protocol Adapter\ninstance #1" -> "AMQP messaging \nnetwork": attach("receiver", "command/TENANT")
-    "Protocol Adapter\ninstance #1" -> "Device Connection\nAPI component": set command handling adapter instance \nfor device 4711 to adapter instance #1
+    "Hono Protocol Adapter\ninstance 1" -> "AMQP messaging \nnetwork": attach("receiver", "command/TENANT")
+    "Hono Protocol Adapter\ninstance 1" -> "AMQP messaging \nnetwork": attach("receiver", "control/TENANT/4711")
 
-    "Protocol Adapter\ninstance #1" -> Application: transfer("event/TENANT","4711","ttd=${ttd}")  via AMQP messaging network
+    "Hono Protocol Adapter\ninstance 1" -> Application: transfer("event/TENANT","4711","ttd=${ttd}")  via AMQP messaging network
     activate Application
 end
 @enduml
diff --git a/docs/concepts/command_control_concept_delegate_2.svg b/docs/concepts/command_control_concept_delegate_2.svg
index f0ec018..ac27c16 100644
--- a/docs/concepts/command_control_concept_delegate_2.svg
+++ b/docs/concepts/command_control_concept_delegate_2.svg
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="620.4px" preserveAspectRatio="none" style="width:1166px;height:620px;" version="1.1" viewBox="0 0 1166 620" width="1166.4px" zoomAndPan="magnify"><defs><filter height="300%" id="fgdssr93bvf" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="594.1406" style="stroke: #A80036; stroke-width: 1.2;" width="439.2" x="177" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="373.8" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#fgdssr93bvf)" height="136.3969" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="501" y="316.7063"/><rect fill="#FFFFFF" filter="url(#fgdssr93bvf)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="867" y="453.1031"/><rect fill="#FFFFFF" filter="url(#fgdssr93bvf)" height="475.6688" style="stroke: #000000; stroke-width: 2.4;" width="1137.6" x="15.6" y="110.0719"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="89.6719" y2="606.1406"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="286.2" x2="286.2" y1="89.6719" y2="606.1406"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="507" x2="507" y1="89.6719" y2="606.1406"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="872.4" x2="872.4" y1="89.6719" y2="606.1406"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="1084.8" x2="1084.8" y1="89.6719" y2="606.1406"/><rect fill="#FEFECE" filter="url(#fgdssr93bvf)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="27.6" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="36" y="71.3098">Device</text><rect fill="#FEFECE" filter="url(#fgdssr93bvf)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="181.8" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="190.2" y="51.7535">Hono Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="86.4" x="240.6" y="71.3098">instance 1</text><rect fill="#FEFECE" filter="url(#fgdssr93bvf)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="402.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="411" y="51.7535">Hono Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="86.4" x="461.4" y="71.3098">instance 2</text><rect fill="#FEFECE" filter="url(#fgdssr93bvf)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="787.2" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="795.6" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="837" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#fgdssr93bvf)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="1029.6" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="1038" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#fgdssr93bvf)" height="136.3969" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="501" y="316.7063"/><rect fill="#FFFFFF" filter="url(#fgdssr93bvf)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="867" y="453.1031"/><path d="M15.6,110.0719 L242.4,110.0719 L242.4,118.4719 L230.4,130.4719 L15.6,130.4719 L15.6,110.0719 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="475.6688" style="stroke: #000000; stroke-width: 2.4;" width="1137.6" x="15.6" y="110.0719"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="33.6" y="125.7521">Command handling</text><polygon fill="#A80036" points="886.2,187.5094,874.2,192.3094,886.2,197.1094,881.4,192.3094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="879" x2="1084.2" y1="192.3094" y2="192.3094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="893.4" y="168.0709">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="133.2" x="909" y="149.9115">attach("receiver",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="168" x="909" y="168.0709">"command_response/</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="913.8" y="186.2303">TENANT/${replyId}")</text><polygon fill="#A80036" points="886.2,240.6281,874.2,245.4281,886.2,250.2281,881.4,245.4281" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="879" x2="1084.2" y1="245.4281" y2="245.4281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="893.4" y="230.2693">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="124.8" x="909" y="221.1896">attach("sender",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="162" x="909" y="239.349">"command/TENANT")</text><polygon fill="#A80036" points="526.2,311.9063,514.2,316.7063,526.2,321.5062,521.4,316.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="519" x2="1084.2" y1="316.7063" y2="316.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="533.4" y="292.4678">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="226.8" x="549" y="274.3084">transfer("command/TENANT",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="553.8" y="292.4678">"command/TENANT/4711","${payload}")</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="225.6" x="563.4" y="310.6271">via AMQP messaging network</text><path d="M388.8,332.3063 L388.8,398.3063 L619.2,398.3063 L619.2,344.3063 L607.2,332.3063 L388.8,332.3063 " fill="#FBFB77" filter="url(#fgdssr93bvf)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M607.2,332.3063 L607.2,344.3063 L619.2,344.3063 L607.2,332.3063 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="194.4" x="396" y="352.7865">Check if command needs</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="196.8" x="396" y="370.9459">to be mapped to gateway</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="396" y="389.1053">(no mapping needed here)</text><polygon fill="#A80036" points="852.6,448.3031,864.6,453.1031,852.6,457.9031,857.4,453.1031" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="507" x2="859.8" y1="453.1031" y2="453.1031"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="515.4" y="437.9443">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="244.8" x="531" y="428.8646">transfer("control/TENANT/4711",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="535.8" y="447.024">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="299.4,501.4219,287.4,506.2219,299.4,511.0219,294.6,506.2219" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="292.2" x2="871.8" y1="506.2219" y2="506.2219"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="306.6" y="491.0631">5</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="244.8" x="322.2" y="481.9834">transfer("control/TENANT/4711",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="327" y="500.1428">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="79.8,536.3813,67.8,541.1813,79.8,545.9812,75,541.1813" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="72.6" x2="285" y1="541.1813" y2="541.1813"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="87" y="535.1021">6</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="175.2" x="102.6" y="535.1021">Command is published</text><polygon fill="#A80036" points="1071,571.3406,1083,576.1406,1071,580.9406,1075.8,576.1406" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="286.2" x2="1078.2" y1="576.1406" y2="576.1406"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="294.6" y="570.0615">7</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="411.6" x="310.2" y="570.0615">disposition("accepted")  via AMQP messaging network</text><!--MD5=[71ddd732be6e84b05c80e4cf67a00485]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="643.2px" preserveAspectRatio="none" style="width:1296px;height:643px;" version="1.1" viewBox="0 0 1296 643" width="1296px" zoomAndPan="magnify"><defs><filter height="300%" id="ffihz7kya2wlh" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="617.1" style="stroke: #A80036; stroke-width: 1.2;" width="708" x="201.6" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="532.8" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="159.3563" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="451.8" y="316.7063"/><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="809.4" y="369.825"/><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="996.6" y="476.0625"/><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="498.6281" style="stroke: #000000; stroke-width: 2.4;" width="1267.2" x="15.6" y="110.0719"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="89.6719" y2="629.1"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="285.6" x2="285.6" y1="89.6719" y2="629.1"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="457.2" x2="457.2" y1="89.6719" y2="629.1"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="814.8" x2="814.8" y1="89.6719" y2="629.1"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="1002" x2="1002" y1="89.6719" y2="629.1"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="1214.4" x2="1214.4" y1="89.6719" y2="629.1"/><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="73.2" x="27.6" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="56.4" x="36" y="71.3098">Device</text><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="154.8" x="206.4" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="138" x="214.8" y="51.7535">Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="100.8" x="233.4" y="71.3098">instance #1</text><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="154.8" x="378" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="138" x="386.4" y="51.7535">Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="100.8" x="405" y="71.3098">instance #2</text><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="174" x="726" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="734.4" y="51.7535">Device Connection</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="126" x="750" y="71.3098">API component</text><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="916.8" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="925.2" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="966.6" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#ffihz7kya2wlh)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="1159.2" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="1167.6" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="159.3563" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="451.8" y="316.7063"/><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="809.4" y="369.825"/><rect fill="#FFFFFF" filter="url(#ffihz7kya2wlh)" height="53.1188" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="996.6" y="476.0625"/><path d="M15.6,110.0719 L242.4,110.0719 L242.4,118.4719 L230.4,130.4719 L15.6,130.4719 L15.6,110.0719 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="498.6281" style="stroke: #000000; stroke-width: 2.4;" width="1267.2" x="15.6" y="110.0719"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="172.8" x="33.6" y="125.7521">Command handling</text><polygon fill="#A80036" points="1015.8,187.5094,1003.8,192.3094,1015.8,197.1094,1011,192.3094" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="1008.6" x2="1213.8" y1="192.3094" y2="192.3094"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="1023" y="168.0709">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="133.2" x="1038.6" y="149.9115">attach("receiver",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="168" x="1038.6" y="168.0709">"command_response/</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="1043.4" y="186.2303">TENANT/${replyId}")</text><polygon fill="#A80036" points="1015.8,240.6281,1003.8,245.4281,1015.8,250.2281,1011,245.4281" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="1008.6" x2="1213.8" y1="245.4281" y2="245.4281"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="1023" y="230.2693">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="124.8" x="1038.6" y="221.1896">attach("sender",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="162" x="1038.6" y="239.349">"command/TENANT")</text><polygon fill="#A80036" points="477,311.9063,465,316.7063,477,321.5062,472.2,316.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="469.8" x2="1213.8" y1="316.7063" y2="316.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="484.2" y="292.4678">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="226.8" x="499.8" y="274.3084">transfer("command/TENANT",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="504.6" y="292.4678">"command/TENANT/4711","${payload}")</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="225.6" x="514.2" y="310.6271">via AMQP messaging network</text><polygon fill="#A80036" points="795,365.025,807,369.825,795,374.625,799.8,369.825" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="463.8" x2="802.2" y1="369.825" y2="369.825"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="472.2" y="354.6662">4</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="242.4" x="487.8" y="345.5865">get command handling adapter</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="195.6" x="487.8" y="363.7459">instances for device 4711</text><polygon fill="#A80036" points="477,418.1438,465,422.9437,477,427.7438,472.2,422.9437" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 2.0,2.0;" x1="469.8" x2="814.2" y1="422.9437" y2="422.9437"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="484.2" y="407.785">5</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="296.4" x="499.8" y="398.7053">JSON containing adapter instance "#1"</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="236.4" x="499.8" y="416.8646">handling commands for "4711"</text><polygon fill="#A80036" points="982.2,471.2625,994.2,476.0625,982.2,480.8625,987,476.0625" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="457.8" x2="989.4" y1="476.0625" y2="476.0625"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="466.2" y="460.9037">6</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="254.4" x="481.8" y="451.824">transfer("command_internal/#1",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="486.6" y="469.9834">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="299.4,524.3813,287.4,529.1813,299.4,533.9812,294.6,529.1813" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="292.2" x2="1001.4" y1="529.1813" y2="529.1813"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="306.6" y="514.0225">7</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="254.4" x="322.2" y="504.9428">transfer("command_internal/#1",</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="310.8" x="327" y="523.1021">"command/TENANT/4711","${payload}")</text><polygon fill="#A80036" points="79.8,559.3406,67.8,564.1406,79.8,568.9406,75,564.1406" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="72.6" x2="285" y1="564.1406" y2="564.1406"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="87" y="558.0615">8</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="175.2" x="102.6" y="558.0615">Command is published</text><polygon fill="#A80036" points="1200.6,594.3,1212.6,599.1,1200.6,603.9,1205.4,599.1" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="286.2" x2="1207.8" y1="599.1" y2="599.1"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="294.6" y="593.0209">9</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="411.6" x="310.2" y="593.0209">disposition("accepted")  via AMQP messaging network</text><!--MD5=[3bd9add0052cc62a66bf16f931f011f7]
 @startuml
 scale 1.2
 hide footbox
 
 participant Device order 10
 box "Hono"
-    participant "Hono Protocol Adapter\ninstance 1" order 30
-    participant "Hono Protocol Adapter\ninstance 2" order 40
+    participant "Protocol Adapter\ninstance #1" order 30
+    participant "Protocol Adapter\ninstance #2" order 40
+    participant "Device Connection\nAPI component" order 50
 end box
 participant "AMQP messaging \nnetwork" order 60
 participant Application order 70
@@ -18,22 +19,21 @@
     Application -> "AMQP messaging \nnetwork": attach("receiver", \n"command_response/\n TENANT/${replyId}")
     Application -> "AMQP messaging \nnetwork": attach("sender", \n"command/TENANT")
 
-    Application -> "Hono Protocol Adapter\ninstance 2": transfer("command/TENANT",\n "command/TENANT/4711","${payload}")\n   via AMQP messaging network
-    activate "Hono Protocol Adapter\ninstance 2"
+    Application -> "Protocol Adapter\ninstance #2": transfer("command/TENANT",\n "command/TENANT/4711","${payload}")\n   via AMQP messaging network
+    activate "Protocol Adapter\ninstance #2"
 
-    note over "Hono Protocol Adapter\ninstance 2"
-    Check if command needs
-    to be mapped to gateway
-    (no mapping needed here)
-    end note
-    "Hono Protocol Adapter\ninstance 2" -> "AMQP messaging \nnetwork": transfer("control/TENANT/4711",\n "command/TENANT/4711","${payload}")
-    deactivate "Hono Protocol Adapter\ninstance 2"
+    "Protocol Adapter\ninstance #2" -> "Device Connection\nAPI component": get command handling adapter \ninstances for device 4711
+    activate "Device Connection\nAPI component"
+    return JSON containing adapter instance "#1" \nhandling commands for "4711"
+
+    "Protocol Adapter\ninstance #2" -> "AMQP messaging \nnetwork": transfer("command_internal/#1",\n "command/TENANT/4711","${payload}")
+    deactivate "Protocol Adapter\ninstance #2"
     activate "AMQP messaging \nnetwork"
-    "AMQP messaging \nnetwork" -> "Hono Protocol Adapter\ninstance 1": transfer("control/TENANT/4711",\n "command/TENANT/4711","${payload}")
+    "AMQP messaging \nnetwork" -> "Protocol Adapter\ninstance #1": transfer("command_internal/#1",\n "command/TENANT/4711","${payload}")
     deactivate "AMQP messaging \nnetwork"
 
-    "Hono Protocol Adapter\ninstance 1" -> Device: Command is published
-    "Hono Protocol Adapter\ninstance 1" -> Application: disposition("accepted")  via AMQP messaging network
+    "Protocol Adapter\ninstance #1" -> Device: Command is published
+    "Protocol Adapter\ninstance #1" -> Application: disposition("accepted")  via AMQP messaging network
 end
 @enduml
 
diff --git a/docs/concepts/command_control_concept_gateway_all_devices_1.svg b/docs/concepts/command_control_concept_gateway_all_devices_1.svg
index d2161d0..d9a2b1a 100644
--- a/docs/concepts/command_control_concept_gateway_all_devices_1.svg
+++ b/docs/concepts/command_control_concept_gateway_all_devices_1.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="590.4px" preserveAspectRatio="none" style="width:1074px;height:590px;" version="1.1" viewBox="0 0 1074 590" width="1074px" zoomAndPan="magnify"><defs><filter height="300%" id="f3s3y7qbr2dv1" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="565.0219" style="stroke: #A80036; stroke-width: 1.2;" width="409.2" x="250.2" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="432" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#f3s3y7qbr2dv1)" height="225.5156" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="353.4" y="340.7063"/><rect fill="#FFFFFF" filter="url(#f3s3y7qbr2dv1)" height="120.6375" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="987" y="445.5844"/><rect fill="#FFFFFF" filter="url(#f3s3y7qbr2dv1)" height="261.8344" style="stroke: #000000; stroke-width: 2.4;" width="1041.6" x="19.2" y="193.35"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="136.8" x2="136.8" y1="89.6719" y2="577.0219"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="359.4" x2="359.4" y1="89.6719" y2="577.0219"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="564.6" x2="564.6" y1="89.6719" y2="577.0219"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="751.8" x2="751.8" y1="89.6719" y2="577.0219"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="992.4" x2="992.4" y1="89.6719" y2="577.0219"/><rect fill="#FEFECE" filter="url(#f3s3y7qbr2dv1)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="87.6" x="91.2" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="70.8" x="99.6" y="71.3098">Gateway</text><rect fill="#FEFECE" filter="url(#f3s3y7qbr2dv1)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="204" x="255" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="187.2" x="263.4" y="51.7535">Hono Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="86.4" x="313.8" y="71.3098">instance 1</text><rect fill="#FEFECE" filter="url(#f3s3y7qbr2dv1)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="174" x="475.8" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="484.2" y="51.7535">Device Connection</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="126" x="499.8" y="71.3098">API component</text><rect fill="#FEFECE" filter="url(#f3s3y7qbr2dv1)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="666.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="675" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="716.4" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#f3s3y7qbr2dv1)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="937.2" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="945.6" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#f3s3y7qbr2dv1)" height="225.5156" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="353.4" y="340.7063"/><rect fill="#FFFFFF" filter="url(#f3s3y7qbr2dv1)" height="120.6375" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="987" y="445.5844"/><path d="M9.6,107.6719 L9.6,173.6719 L260.4,173.6719 L260.4,119.6719 L248.4,107.6719 L9.6,107.6719 " fill="#FBFB77" filter="url(#f3s3y7qbr2dv1)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M248.4,107.6719 L248.4,119.6719 L260.4,119.6719 L248.4,107.6719 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="160.8" x="16.8" y="128.1521">The gateway 'gw-1' is</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="225.6" x="16.8" y="146.3115">connected and authenticated</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="136.8" x="16.8" y="164.4709">with TENANT/gw-1</text><path d="M19.2,193.35 L278.4,193.35 L278.4,201.75 L266.4,213.75 L19.2,213.75 L19.2,193.35 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="261.8344" style="stroke: #000000; stroke-width: 2.4;" width="1041.6" x="19.2" y="193.35"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="37.2" y="209.0303">Command subscription</text><path d="M31.2,219.9094 L31.2,285.9094 L238.8,285.9094 L238.8,231.9094 L226.8,219.9094 L31.2,219.9094 " fill="#FBFB77" filter="url(#f3s3y7qbr2dv1)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M226.8,219.9094 L226.8,231.9094 L238.8,231.9094 L226.8,219.9094 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="182.4" x="38.4" y="240.3896">The gateway subscribes</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="176.4" x="38.4" y="258.549">to commands just as a</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="156" x="38.4" y="276.7084">normal device would</text><polygon fill="#A80036" points="339,335.9063,351,340.7063,339,345.5062,343.8,340.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="137.4" x2="346.2" y1="340.7063" y2="340.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="145.8" y="325.5475">0</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="177.6" x="161.4" y="316.4678">Command subscription</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="102" x="166.2" y="334.6271">/ TTD request</text><polygon fill="#A80036" points="738,370.8656,750,375.6656,738,380.4656,742.8,375.6656" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="745.2" y1="375.6656" y2="375.6656"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="369.5865">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="300" x="389.4" y="369.5865">attach("receiver", "command/TENANT")</text><polygon fill="#A80036" points="738,405.825,750,410.625,738,415.425,742.8,410.625" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="745.2" y1="410.625" y2="410.625"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="404.5459">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="315.6" x="389.4" y="404.5459">attach("receiver", "control/TENANT/gw-1")</text><polygon fill="#A80036" points="972.6,440.7844,984.6,445.5844,972.6,450.3844,977.4,445.5844" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="979.8" y1="445.5844" y2="445.5844"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="439.5053">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="583.2" x="389.4" y="439.5053">transfer("event/TENANT","gw-1","ttd=${ttd}")  via AMQP messaging network</text><path d="M72,469.5844 L72,553.5844 L628.8,553.5844 L628.8,481.5844 L616.8,469.5844 L72,469.5844 " fill="#FBFB77" filter="url(#f3s3y7qbr2dv1)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M616.8,469.5844 L616.8,481.5844 L628.8,481.5844 L616.8,469.5844 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="502.8" x="91.5" y="490.0646">In order for commands to be successfully mapped to the gateway</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="462" x="91.5" y="508.224">from here on, the gateway must have acted on behalf of the</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="465.6" x="91.5" y="526.3834">command target device (e.g. sent telemetry for it) or it must</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="364.8" x="91.5" y="544.5428">be the only gateway associated with the device.</text><!--MD5=[0e0adb0319001e8de4010f18d7c7ed35]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="543.6px" preserveAspectRatio="none" style="width:1074px;height:543px;" version="1.1" viewBox="0 0 1074 543" width="1074px" zoomAndPan="magnify"><defs><filter height="300%" id="f1jklk7noazmnx" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.4"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.8" dy="4.8" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><rect fill="#DDDDDD" height="518.0625" style="stroke: #A80036; stroke-width: 1.2;" width="410.4" x="274.8" y="4.8"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="45.6" x="457.2" y="19.2803">Hono</text><rect fill="#FFFFFF" filter="url(#f1jklk7noazmnx)" height="178.5563" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="353.4" y="340.7063"/><rect fill="#FFFFFF" filter="url(#f1jklk7noazmnx)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="987" y="500.0625"/><rect fill="#FFFFFF" filter="url(#f1jklk7noazmnx)" height="316.3125" style="stroke: #000000; stroke-width: 2.4;" width="1041.6" x="19.2" y="193.35"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="136.8" x2="136.8" y1="89.6719" y2="530.0625"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="358.8" x2="358.8" y1="89.6719" y2="530.0625"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="590.4" x2="590.4" y1="89.6719" y2="530.0625"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="777.6" x2="777.6" y1="89.6719" y2="530.0625"/><line style="stroke: #A80036; stroke-width: 1.2; stroke-dasharray: 5.0,5.0;" x1="992.4" x2="992.4" y1="89.6719" y2="530.0625"/><rect fill="#FEFECE" filter="url(#f1jklk7noazmnx)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="87.6" x="91.2" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="70.8" x="99.6" y="71.3098">Gateway</text><rect fill="#FEFECE" filter="url(#f1jklk7noazmnx)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="154.8" x="279.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="138" x="288" y="51.7535">Protocol Adapter</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="100.8" x="306.6" y="71.3098">instance #1</text><rect fill="#FEFECE" filter="url(#f1jklk7noazmnx)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="174" x="501.6" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="157.2" x="510" y="51.7535">Device Connection</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="126" x="525.6" y="71.3098">API component</text><rect fill="#FEFECE" filter="url(#f1jklk7noazmnx)" height="55.9125" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="166.8" x="692.4" y="27.7594"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="145.2" x="700.8" y="51.7535">AMQP messaging</text><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="67.2" x="742.2" y="71.3098">network</text><rect fill="#FEFECE" filter="url(#f1jklk7noazmnx)" height="36.3562" style="stroke: #A80036; stroke-width: 1.7999999999999998;" width="106.8" x="937.2" y="47.3156"/><text fill="#000000" font-family="sans-serif" font-size="16.8" lengthAdjust="spacingAndGlyphs" textLength="90" x="945.6" y="71.3098">Application</text><rect fill="#FFFFFF" filter="url(#f1jklk7noazmnx)" height="178.5563" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="353.4" y="340.7063"/><rect fill="#FFFFFF" filter="url(#f1jklk7noazmnx)" height="19.2" style="stroke: #A80036; stroke-width: 1.2;" width="12" x="987" y="500.0625"/><path d="M9.6,107.6719 L9.6,173.6719 L260.4,173.6719 L260.4,119.6719 L248.4,107.6719 L9.6,107.6719 " fill="#FBFB77" filter="url(#f1jklk7noazmnx)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M248.4,107.6719 L248.4,119.6719 L260.4,119.6719 L248.4,107.6719 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="160.8" x="16.8" y="128.1521">The gateway 'gw-1' is</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="225.6" x="16.8" y="146.3115">connected and authenticated</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="136.8" x="16.8" y="164.4709">with TENANT/gw-1</text><path d="M19.2,193.35 L278.4,193.35 L278.4,201.75 L266.4,213.75 L19.2,213.75 L19.2,193.35 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.2;"/><rect fill="none" height="316.3125" style="stroke: #000000; stroke-width: 2.4;" width="1041.6" x="19.2" y="193.35"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="205.2" x="37.2" y="209.0303">Command subscription</text><path d="M31.2,219.9094 L31.2,285.9094 L238.8,285.9094 L238.8,231.9094 L226.8,219.9094 L31.2,219.9094 " fill="#FBFB77" filter="url(#f1jklk7noazmnx)" style="stroke: #A80036; stroke-width: 1.2;"/><path d="M226.8,219.9094 L226.8,231.9094 L238.8,231.9094 L226.8,219.9094 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.2;"/><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="182.4" x="38.4" y="240.3896">The gateway subscribes</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="176.4" x="38.4" y="258.549">to commands just as a</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="156" x="38.4" y="276.7084">normal device would</text><polygon fill="#A80036" points="339,335.9063,351,340.7063,339,345.5062,343.8,340.7063" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="137.4" x2="346.2" y1="340.7063" y2="340.7063"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="145.8" y="325.5475">0</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="177.6" x="161.4" y="316.4678">Command subscription</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="102" x="166.2" y="334.6271">/ TTD request</text><polygon fill="#A80036" points="763.8,370.8656,775.8,375.6656,763.8,380.4656,768.6,375.6656" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="771" y1="375.6656" y2="375.6656"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="369.5865">1</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="300" x="389.4" y="369.5865">attach("receiver", "command/TENANT")</text><polygon fill="#A80036" points="576.6,460.3031,588.6,465.1031,576.6,469.9031,581.4,465.1031" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="583.8" y1="465.1031" y2="465.1031"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="431.785">2</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="176.4" x="389.4" y="404.5459">set command handling</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="129.6" x="389.4" y="422.7053">adapter instance</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="122.4" x="389.4" y="440.8646">for device 'gw-1'</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="177.6" x="389.4" y="459.024">to adapter instance #1</text><polygon fill="#A80036" points="972.6,495.2625,984.6,500.0625,972.6,504.8625,977.4,500.0625" style="stroke: #A80036; stroke-width: 1.2;"/><line style="stroke: #A80036; stroke-width: 1.2;" x1="365.4" x2="979.8" y1="500.0625" y2="500.0625"/><text fill="#000000" font-family="sans-serif" font-size="15.6" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10.8" x="373.8" y="493.9834">3</text><text fill="#000000" font-family="sans-serif" font-size="15.6" lengthAdjust="spacingAndGlyphs" textLength="583.2" x="389.4" y="493.9834">transfer("event/TENANT","gw-1","ttd=${ttd}")  via AMQP messaging network</text><!--MD5=[93e2f9ddcc703299e7ec00e54289c11f]
 @startuml
 scale 1.2
 hide footbox
 
 participant Gateway order 20
 box "Hono"
-    participant "Hono Protocol Adapter\ninstance 1" order 30
+    participant "Protocol Adapter\ninstance #1" order 30
     participant "Device Connection\nAPI component" order 50
 end box
 participant "AMQP messaging \nnetwork" order 60
@@ -25,23 +25,16 @@
     to commands just as a
     normal device would
     end note
-    Gateway -> "Hono Protocol Adapter\ninstance 1": Command subscription\n / TTD request
-    activate "Hono Protocol Adapter\ninstance 1"
+    Gateway -> "Protocol Adapter\ninstance #1": Command subscription\n / TTD request
+    activate "Protocol Adapter\ninstance #1"
 
-    "Hono Protocol Adapter\ninstance 1" -> "AMQP messaging \nnetwork": attach("receiver", "command/TENANT")
-    "Hono Protocol Adapter\ninstance 1" -> "AMQP messaging \nnetwork": attach("receiver", "control/TENANT/gw-1")
+    "Protocol Adapter\ninstance #1" -> "AMQP messaging \nnetwork": attach("receiver", "command/TENANT")
+    "Protocol Adapter\ninstance #1" -> "Device Connection\nAPI component": set command handling \nadapter instance \nfor device 'gw-1' \nto adapter instance #1
 
-    "Hono Protocol Adapter\ninstance 1" -> Application: transfer("event/TENANT","gw-1","ttd=${ttd}")  via AMQP messaging network
+    "Protocol Adapter\ninstance #1" -> Application: transfer("event/TENANT","gw-1","ttd=${ttd}")  via AMQP messaging network
     activate Application
 end
 
-note over Gateway, "Device Connection\nAPI component"
-In order for commands to be successfully mapped to the gateway
-from here on, the gateway must have acted on behalf of the
-command target device (e.g. sent telemetry for it) or it must
-be the only gateway associated with the device.
-end note
-
 @enduml
 
 PlantUML version 1.2019.11(Sun Sep 22 12:02:15 CEST 2019)
diff --git a/docs/concepts/connecting-devices/index.html b/docs/concepts/connecting-devices/index.html
index ffb4edb..23229a4 100644
--- a/docs/concepts/connecting-devices/index.html
+++ b/docs/concepts/connecting-devices/index.html
@@ -21,19 +21,19 @@
     <title>Connecting Devices :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/connecting-devices/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/connecting-devices/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/connecting-devices/">1.1</option>
@@ -1394,6 +1420,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/connecting-devices/">dev</option>
@@ -2666,20 +2694,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/connection-events/index.html b/docs/concepts/connection-events/index.html
index 12ce29b..6af2ebb 100644
--- a/docs/concepts/connection-events/index.html
+++ b/docs/concepts/connection-events/index.html
@@ -21,19 +21,19 @@
     <title>Connection Events :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/connection-events/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/connection-events/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/connection-events/">1.1</option>
@@ -1392,6 +1418,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/concepts/connection-events/">1.0</option>
@@ -1412,6 +1440,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/connection-events/">dev</option>
@@ -2553,20 +2583,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/device-identity/index.html b/docs/concepts/device-identity/index.html
index 65eb39c..2e0bc49 100644
--- a/docs/concepts/device-identity/index.html
+++ b/docs/concepts/device-identity/index.html
@@ -21,19 +21,19 @@
     <title>Device Identity :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/device-identity/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/device-identity/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/device-identity/">1.1</option>
@@ -1392,6 +1418,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/concepts/device-identity/">1.0</option>
@@ -1412,6 +1440,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/device-identity/">dev</option>
@@ -2573,20 +2603,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/device-notifications/index.html b/docs/concepts/device-notifications/index.html
index 6e2b407..98df1ce 100644
--- a/docs/concepts/device-notifications/index.html
+++ b/docs/concepts/device-notifications/index.html
@@ -21,19 +21,19 @@
     <title>Device Notifications :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,12 +1346,36 @@
               
                   
               
+                  
+              
           
               
               
                   
               
                   
+                    
+                    
+                      <option id="1.3" value="/hono/docs/1.3/concepts/device-notifications/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
               
                   
               
@@ -2590,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/device-provisioning/index.html b/docs/concepts/device-provisioning/index.html
index 511cf3c..4f6205c 100644
--- a/docs/concepts/device-provisioning/index.html
+++ b/docs/concepts/device-provisioning/index.html
@@ -21,19 +21,19 @@
     <title>Device Provisioning :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/device-provisioning/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/device-provisioning/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/device-provisioning/">1.1</option>
@@ -1394,6 +1420,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/device-provisioning/">dev</option>
@@ -2611,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/index.html b/docs/concepts/index.html
index f8b1a4e..bc5def7 100644
--- a/docs/concepts/index.html
+++ b/docs/concepts/index.html
@@ -21,19 +21,19 @@
     <title>Concepts :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/">1.1</option>
@@ -1392,6 +1418,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/concepts/">1.0</option>
@@ -1412,6 +1440,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/">dev</option>
@@ -2513,20 +2543,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/resource-limits/index.html b/docs/concepts/resource-limits/index.html
index 8a2bf35..917a48e 100644
--- a/docs/concepts/resource-limits/index.html
+++ b/docs/concepts/resource-limits/index.html
@@ -21,19 +21,19 @@
     <title>Resource limits :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,6 +1346,8 @@
               
                   
               
+                  
+              
           
               
               
@@ -1354,6 +1356,28 @@
                   
                     
                     
+                      <option id="1.3" value="/hono/docs/1.3/concepts/resource-limits/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
+                    
+                    
                       <option id="1.2" value="/hono/docs/1.2/concepts/resource-limits/">1.2</option>
                     
                   
@@ -1372,6 +1396,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.1" value="/hono/docs/1.1/concepts/resource-limits/">1.1</option>
@@ -1392,6 +1418,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="1.0" value="/hono/docs/1.0/concepts/resource-limits/">1.0</option>
@@ -1412,6 +1440,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/resource-limits/">dev</option>
@@ -2617,20 +2647,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/docs/concepts/tenancy/index.html b/docs/concepts/tenancy/index.html
index 94aa12e..6da94d0 100644
--- a/docs/concepts/tenancy/index.html
+++ b/docs/concepts/tenancy/index.html
@@ -21,19 +21,19 @@
     <title>Multi-Tenancy :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1596417817" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1596417817" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1596504224" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1596504224" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1596417817" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1596504224" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1596417817"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1596504224"></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?1596417817"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1596504224"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1596504224"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1596417817"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1596504224"></script>
 
     
   </div>
@@ -1346,12 +1346,36 @@
               
                   
               
+                  
+              
           
               
               
                   
               
                   
+                    
+                    
+                      <option id="1.3" value="/hono/docs/1.3/concepts/tenancy/">1.3</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+              
+                  
               
                   
               
@@ -2627,20 +2651,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?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596417817"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596417817"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1596417817"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1596417817"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596417817"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1596417817"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1596504224"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1596504224"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1596504224"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1596504224"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1596504224"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1596504224"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1596417817"></script>
-    <script src="/hono/docs/js/learn.js?1596417817"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1596417817"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1596504224"></script>
+    <script src="/hono/docs/js/learn.js?1596504224"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1596504224"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1596417817" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1596417817"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1596504224" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1596504224"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>