diff --git a/analysis.json b/analysis.json
index 6c40370d2..76b73ab88 100644
--- a/analysis.json
+++ b/analysis.json
@@ -13,11 +13,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 340,
+              "line": 355,
               "column": 8
             },
             "end": {
-              "line": 340,
+              "line": 355,
               "column": 24
             }
           },
@@ -58,11 +58,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 329,
+              "line": 344,
               "column": 8
             },
             "end": {
-              "line": 329,
+              "line": 344,
               "column": 21
             }
           },
@@ -79,11 +79,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 354,
+              "line": 369,
               "column": 8
             },
             "end": {
-              "line": 357,
+              "line": 372,
               "column": 9
             }
           },
@@ -101,11 +101,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 372,
+              "line": 387,
               "column": 8
             },
             "end": {
-              "line": 375,
+              "line": 390,
               "column": 9
             }
           },
@@ -123,11 +123,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 379,
+              "line": 394,
               "column": 8
             },
             "end": {
-              "line": 382,
+              "line": 397,
               "column": 9
             }
           },
@@ -145,11 +145,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 395,
+              "line": 410,
               "column": 8
             },
             "end": {
-              "line": 398,
+              "line": 413,
               "column": 9
             }
           },
@@ -167,11 +167,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 402,
+              "line": 417,
               "column": 8
             },
             "end": {
-              "line": 406,
+              "line": 421,
               "column": 9
             }
           },
@@ -190,11 +190,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 411,
+              "line": 426,
               "column": 8
             },
             "end": {
-              "line": 414,
+              "line": 429,
               "column": 9
             }
           },
@@ -212,11 +212,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 419,
+              "line": 434,
               "column": 8
             },
             "end": {
-              "line": 422,
+              "line": 437,
               "column": 9
             }
           },
@@ -234,11 +234,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 430,
+              "line": 445,
               "column": 8
             },
             "end": {
-              "line": 433,
+              "line": 448,
               "column": 9
             }
           },
@@ -256,11 +256,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 437,
+              "line": 452,
               "column": 8
             },
             "end": {
-              "line": 440,
+              "line": 455,
               "column": 9
             }
           },
@@ -271,6 +271,28 @@
             }
           }
         },
+        {
+          "name": "_hasApicCorsExtension",
+          "type": "boolean | null | undefined",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 456,
+              "column": 8
+            },
+            "end": {
+              "line": 456,
+              "column": 84
+            }
+          },
+          "metadata": {
+            "polymer": {
+              "observer": "\"_hasCorsExtensionChanged\"",
+              "attributeType": "Boolean"
+            }
+          }
+        },
         {
           "name": "appendHeaders",
           "type": "string | null | undefined",
@@ -278,11 +300,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 448,
+              "line": 464,
               "column": 8
             },
             "end": {
-              "line": 448,
+              "line": 464,
               "column": 29
             }
           },
@@ -299,11 +321,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 454,
+              "line": 470,
               "column": 8
             },
             "end": {
-              "line": 457,
+              "line": 473,
               "column": 9
             }
           },
@@ -320,11 +342,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 469,
+              "line": 485,
               "column": 8
             },
             "end": {
-              "line": 469,
+              "line": 485,
               "column": 21
             }
           },
@@ -341,11 +363,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 475,
+              "line": 491,
               "column": 8
             },
             "end": {
-              "line": 475,
+              "line": 491,
               "column": 31
             }
           },
@@ -362,11 +384,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 482,
+              "line": 498,
               "column": 8
             },
             "end": {
-              "line": 482,
+              "line": 498,
               "column": 24
             }
           },
@@ -383,11 +405,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 490,
+              "line": 506,
               "column": 8
             },
             "end": {
-              "line": 490,
+              "line": 506,
               "column": 33
             }
           },
@@ -404,11 +426,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 494,
+              "line": 510,
               "column": 8
             },
             "end": {
-              "line": 497,
+              "line": 513,
               "column": 9
             }
           },
@@ -426,11 +448,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 506,
+              "line": 522,
               "column": 8
             },
             "end": {
-              "line": 506,
+              "line": 522,
               "column": 31
             }
           },
@@ -447,11 +469,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 511,
+              "line": 527,
               "column": 8
             },
             "end": {
-              "line": 514,
+              "line": 530,
               "column": 9
             }
           },
@@ -469,11 +491,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 519,
+              "line": 535,
               "column": 8
             },
             "end": {
-              "line": 519,
+              "line": 535,
               "column": 29
             }
           },
@@ -490,11 +512,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 529,
+              "line": 545,
               "column": 8
             },
             "end": {
-              "line": 529,
+              "line": 545,
               "column": 27
             }
           },
@@ -511,11 +533,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 535,
+              "line": 551,
               "column": 8
             },
             "end": {
-              "line": 535,
+              "line": 551,
               "column": 28
             }
           },
@@ -532,11 +554,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 542,
+              "line": 558,
               "column": 8
             },
             "end": {
-              "line": 542,
+              "line": 558,
               "column": 23
             }
           },
@@ -553,11 +575,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 548,
+              "line": 564,
               "column": 8
             },
             "end": {
-              "line": 551,
+              "line": 567,
               "column": 9
             }
           },
@@ -575,11 +597,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 557,
+              "line": 573,
               "column": 8
             },
             "end": {
-              "line": 560,
+              "line": 576,
               "column": 9
             }
           },
@@ -597,11 +619,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 564,
+              "line": 580,
               "column": 8
             },
             "end": {
-              "line": 567,
+              "line": 583,
               "column": 9
             }
           },
@@ -619,11 +641,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 572,
+              "line": 588,
               "column": 8
             },
             "end": {
-              "line": 578,
+              "line": 594,
               "column": 9
             }
           },
@@ -641,11 +663,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 584,
+              "line": 600,
               "column": 8
             },
             "end": {
-              "line": 587,
+              "line": 603,
               "column": 9
             }
           },
@@ -662,11 +684,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 596,
+              "line": 612,
               "column": 8
             },
             "end": {
-              "line": 596,
+              "line": 612,
               "column": 27
             }
           },
@@ -683,11 +705,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 600,
+              "line": 616,
               "column": 8
             },
             "end": {
-              "line": 603,
+              "line": 619,
               "column": 9
             }
           },
@@ -705,11 +727,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 612,
+              "line": 628,
               "column": 8
             },
             "end": {
-              "line": 615,
+              "line": 631,
               "column": 9
             }
           },
@@ -726,11 +748,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 620,
+              "line": 636,
               "column": 8
             },
             "end": {
-              "line": 620,
+              "line": 636,
               "column": 27
             }
           },
@@ -747,11 +769,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 627,
+              "line": 643,
               "column": 8
             },
             "end": {
-              "line": 627,
+              "line": 643,
               "column": 52
             }
           },
@@ -769,11 +791,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 629,
+              "line": 645,
               "column": 8
             },
             "end": {
-              "line": 632,
+              "line": 648,
               "column": 9
             }
           },
@@ -791,11 +813,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 634,
+              "line": 650,
               "column": 8
             },
             "end": {
-              "line": 637,
+              "line": 653,
               "column": 9
             }
           },
@@ -813,11 +835,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 643,
+              "line": 659,
               "column": 8
             },
             "end": {
-              "line": 646,
+              "line": 662,
               "column": 9
             }
           },
@@ -835,11 +857,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 652,
+              "line": 668,
               "column": 8
             },
             "end": {
-              "line": 652,
+              "line": 668,
               "column": 28
             }
           },
@@ -856,11 +878,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 659,
+              "line": 675,
               "column": 8
             },
             "end": {
-              "line": 659,
+              "line": 675,
               "column": 35
             }
           },
@@ -877,11 +899,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 665,
+              "line": 681,
               "column": 8
             },
             "end": {
-              "line": 665,
+              "line": 681,
               "column": 28
             }
           },
@@ -898,11 +920,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 672,
+              "line": 688,
               "column": 9
             },
             "end": {
-              "line": 672,
+              "line": 688,
               "column": 35
             }
           },
@@ -919,11 +941,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 677,
+              "line": 693,
               "column": 9
             },
             "end": {
-              "line": 677,
+              "line": 693,
               "column": 24
             }
           },
@@ -940,11 +962,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 687,
+              "line": 703,
               "column": 9
             },
             "end": {
-              "line": 687,
+              "line": 703,
               "column": 29
             }
           },
@@ -2552,11 +2574,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 696,
+              "line": 712,
               "column": 4
             },
             "end": {
-              "line": 700,
+              "line": 716,
               "column": 5
             }
           },
@@ -2572,11 +2594,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 702,
+              "line": 718,
               "column": 4
             },
             "end": {
-              "line": 705,
+              "line": 721,
               "column": 5
             }
           },
@@ -2592,11 +2614,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 707,
+              "line": 723,
               "column": 4
             },
             "end": {
-              "line": 710,
+              "line": 726,
               "column": 5
             }
           },
@@ -2612,11 +2634,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 718,
+              "line": 734,
               "column": 4
             },
             "end": {
-              "line": 727,
+              "line": 743,
               "column": 5
             }
           },
@@ -2638,11 +2660,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 732,
+              "line": 748,
               "column": 4
             },
             "end": {
-              "line": 741,
+              "line": 757,
               "column": 5
             }
           },
@@ -2663,11 +2685,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 746,
+              "line": 762,
               "column": 4
             },
             "end": {
-              "line": 750,
+              "line": 766,
               "column": 5
             }
           },
@@ -2688,11 +2710,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 755,
+              "line": 771,
               "column": 4
             },
             "end": {
-              "line": 757,
+              "line": 773,
               "column": 5
             }
           },
@@ -2708,11 +2730,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 761,
+              "line": 777,
               "column": 4
             },
             "end": {
-              "line": 767,
+              "line": 783,
               "column": 5
             }
           },
@@ -2728,11 +2750,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 774,
+              "line": 790,
               "column": 4
             },
             "end": {
-              "line": 776,
+              "line": 792,
               "column": 5
             }
           },
@@ -2755,11 +2777,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 783,
+              "line": 799,
               "column": 4
             },
             "end": {
-              "line": 785,
+              "line": 801,
               "column": 5
             }
           },
@@ -2781,11 +2803,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 792,
+              "line": 808,
               "column": 4
             },
             "end": {
-              "line": 794,
+              "line": 810,
               "column": 5
             }
           },
@@ -2807,11 +2829,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 798,
+              "line": 814,
               "column": 4
             },
             "end": {
-              "line": 807,
+              "line": 823,
               "column": 5
             }
           },
@@ -2827,11 +2849,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 811,
+              "line": 827,
               "column": 4
             },
             "end": {
-              "line": 813,
+              "line": 829,
               "column": 5
             }
           },
@@ -2847,11 +2869,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 820,
+              "line": 836,
               "column": 4
             },
             "end": {
-              "line": 831,
+              "line": 847,
               "column": 5
             }
           },
@@ -2872,11 +2894,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 835,
+              "line": 851,
               "column": 4
             },
             "end": {
-              "line": 837,
+              "line": 853,
               "column": 5
             }
           },
@@ -2892,11 +2914,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 845,
+              "line": 861,
               "column": 4
             },
             "end": {
-              "line": 847,
+              "line": 863,
               "column": 5
             }
           },
@@ -2921,11 +2943,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 855,
+              "line": 871,
               "column": 4
             },
             "end": {
-              "line": 857,
+              "line": 873,
               "column": 5
             }
           },
@@ -2941,11 +2963,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 862,
+              "line": 878,
               "column": 4
             },
             "end": {
-              "line": 867,
+              "line": 883,
               "column": 5
             }
           },
@@ -2961,11 +2983,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 872,
+              "line": 888,
               "column": 4
             },
             "end": {
-              "line": 876,
+              "line": 892,
               "column": 5
             }
           },
@@ -2981,17 +3003,41 @@
             "type": "void"
           }
         },
+        {
+          "name": "_hasCorsExtensionChanged",
+          "description": "",
+          "privacy": "protected",
+          "sourceRange": {
+            "start": {
+              "line": 893,
+              "column": 4
+            },
+            "end": {
+              "line": 897,
+              "column": 5
+            }
+          },
+          "metadata": {},
+          "params": [
+            {
+              "name": "value"
+            }
+          ],
+          "return": {
+            "type": "void"
+          }
+        },
         {
           "name": "_computeIsMethod",
           "description": "Computes value of `isMethod` proiperty.",
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 883,
+              "line": 904,
               "column": 4
             },
             "end": {
-              "line": 885,
+              "line": 906,
               "column": 5
             }
           },
@@ -3014,11 +3060,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 895,
+              "line": 916,
               "column": 4
             },
             "end": {
-              "line": 900,
+              "line": 921,
               "column": 5
             }
           },
@@ -3052,11 +3098,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 902,
+              "line": 923,
               "column": 4
             },
             "end": {
-              "line": 907,
+              "line": 928,
               "column": 5
             }
           },
@@ -3076,11 +3122,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 917,
+              "line": 938,
               "column": 4
             },
             "end": {
-              "line": 935,
+              "line": 956,
               "column": 5
             }
           },
@@ -3118,11 +3164,11 @@
       "metadata": {},
       "sourceRange": {
         "start": {
-          "line": 316,
+          "line": 331,
           "column": 2
         },
         "end": {
-          "line": 936,
+          "line": 957,
           "column": 3
         }
       },
@@ -3135,11 +3181,11 @@
           "description": "Generated AMF json/ld model form the API spec.\nThe element assumes the object of the first array item to be a\ntype of `\"http://raml.org/vocabularies/document#Document`\non AMF vocabulary.\n\nIt is only usefult for the element to resolve references.",
           "sourceRange": {
             "start": {
-              "line": 340,
+              "line": 355,
               "column": 8
             },
             "end": {
-              "line": 340,
+              "line": 355,
               "column": 24
             }
           },
@@ -3169,11 +3215,11 @@
           "description": "You can use `raml-aware` component to pass AMF data to the console.\nRaml aware uses monostate pattern to pass the data to any other\ninstance of the same component and receives updates from them.\n\nWhen using `<raml-aware>` set it's `scope` property to some name\nand this property to the same name. Once you update `raml` property\non the aware it updates the model in the console.",
           "sourceRange": {
             "start": {
-              "line": 329,
+              "line": 344,
               "column": 8
             },
             "end": {
-              "line": 329,
+              "line": 344,
               "column": 21
             }
           },
@@ -3185,11 +3231,11 @@
           "description": "It is current selection from the navigation represented\nas an `@id` property of the AMD json/ld model.\n\nThis property is updated internally when the user performs a navigation.\nChange this property (with `selectedShapeType` property if needed)\nto force the console to render specific view.\n\n## example\n```\nfile://demo/models/api-name/api.raml#/web-api/end-points/%2Ftest-endpoint\n```",
           "sourceRange": {
             "start": {
-              "line": 354,
+              "line": 369,
               "column": 8
             },
             "end": {
-              "line": 357,
+              "line": 372,
               "column": 9
             }
           },
@@ -3201,11 +3247,11 @@
           "description": "One of recognizable bby the console types of currently rendered\ndocumentation. It can be one of:\n\n- summary\n- documentation\n- type\n- security\n- endpoint\n- method\n\nUse it with combination of setting `selectedShape` property to control\nthe view.",
           "sourceRange": {
             "start": {
-              "line": 372,
+              "line": 387,
               "column": 8
             },
             "end": {
-              "line": 375,
+              "line": 390,
               "column": 9
             }
           },
@@ -3217,11 +3263,11 @@
           "description": "Computed value, true if current selection represent a method",
           "sourceRange": {
             "start": {
-              "line": 379,
+              "line": 394,
               "column": 8
             },
             "end": {
-              "line": 382,
+              "line": 397,
               "column": 9
             }
           },
@@ -3233,11 +3279,11 @@
           "description": "Location of the AMF json/ld model. It can be an endpoint that\nproduces AMF model or a file that contains generated model.\n\nWhen changed it download's data from the location\nand assigns value to the `amfModel` property.\n\n## Example\n```html\n<api-console model-location=\"https://amf-parser/domain.com\"></api-console>\n```",
           "sourceRange": {
             "start": {
-              "line": 395,
+              "line": 410,
               "column": 8
             },
             "end": {
-              "line": 398,
+              "line": 413,
               "column": 9
             }
           },
@@ -3249,11 +3295,11 @@
           "description": "Currently rendered page. It can be either `docs` or `request`.",
           "sourceRange": {
             "start": {
-              "line": 402,
+              "line": 417,
               "column": 8
             },
             "end": {
-              "line": 406,
+              "line": 421,
               "column": 9
             }
           },
@@ -3265,11 +3311,11 @@
           "description": "Computed value (read only), `true` when current page is the\nrequest panel.",
           "sourceRange": {
             "start": {
-              "line": 411,
+              "line": 426,
               "column": 8
             },
             "end": {
-              "line": 414,
+              "line": 429,
               "column": 9
             }
           },
@@ -3281,11 +3327,11 @@
           "description": "Computed value (read only), `true` when current page is the\ndocumentation panel.",
           "sourceRange": {
             "start": {
-              "line": 419,
+              "line": 434,
               "column": 8
             },
             "end": {
-              "line": 422,
+              "line": 437,
               "column": 9
             }
           },
@@ -3297,11 +3343,11 @@
           "description": "The API console works with API console extension that proxies\nrequest through Chrome extension's sandbox and eliminates CORS.\n\nThe banner informing a user about the extension is rendered\nautomatically unless this property is set.",
           "sourceRange": {
             "start": {
-              "line": 430,
+              "line": 445,
               "column": 8
             },
             "end": {
-              "line": 433,
+              "line": 448,
               "column": 9
             }
           },
@@ -3313,11 +3359,11 @@
           "description": "When set the extension banner is rendered.",
           "sourceRange": {
             "start": {
-              "line": 437,
+              "line": 452,
               "column": 8
             },
             "end": {
-              "line": 440,
+              "line": 455,
               "column": 9
             }
           },
@@ -3329,11 +3375,11 @@
           "description": "Forces the console to send headers defined in this string overriding\nany used defined header.\nIt can be useful if the console has to send any headers string\nto a server without user knowing about it.\nThe headers should be valid HTTP headers string.",
           "sourceRange": {
             "start": {
-              "line": 448,
+              "line": 464,
               "column": 8
             },
             "end": {
-              "line": 448,
+              "line": 464,
               "column": 29
             }
           },
@@ -3345,11 +3391,11 @@
           "description": "If true it forces the console to render narrow layout.\nThis hides left hand side navigation and some fonts are smaller\n(like titles).",
           "sourceRange": {
             "start": {
-              "line": 454,
+              "line": 470,
               "column": 8
             },
             "end": {
-              "line": 457,
+              "line": 473,
               "column": 9
             }
           },
@@ -3361,11 +3407,11 @@
           "description": "If set every request made from the console will be proxied by the service provided in this\nvalue.\nIt will prefix entered URL with the proxy value. so the call to\n`http://domain.com/path/?query=some+value` will become\n`https://proxy.com/path/http://domain.com/path/?query=some+value`\n\nIf the proxy require a to pass the URL as a query parameter define value as follows:\n`https://proxy.com/path/?url=`. In this case be sure to set `proxy-encode-url`\nattribute.",
           "sourceRange": {
             "start": {
-              "line": 469,
+              "line": 485,
               "column": 8
             },
             "end": {
-              "line": 469,
+              "line": 485,
               "column": 21
             }
           },
@@ -3377,11 +3423,11 @@
           "description": "If `proxy` is set, it will URL encode the request URL before appending it to the proxy URL.\n`http://domain.com/path/?query=some+value` will become\n`https://proxy.com/?url=http%3A%2F%2Fdomain.com%2Fpath%2F%3Fquery%3Dsome%2Bvalue`",
           "sourceRange": {
             "start": {
-              "line": 475,
+              "line": 491,
               "column": 8
             },
             "end": {
-              "line": 475,
+              "line": 491,
               "column": 31
             }
           },
@@ -3393,11 +3439,11 @@
           "description": "If set then the API console hide the \"try it\" button from the\nmethod documentation view. The request and response panels still will\nbe available, but to enter this section you'll have to do it\nprogramatically.",
           "sourceRange": {
             "start": {
-              "line": 482,
+              "line": 498,
               "column": 8
             },
             "end": {
-              "line": 482,
+              "line": 498,
               "column": 24
             }
           },
@@ -3409,11 +3455,11 @@
           "description": "If set, the open navigation button will be always hidden.\nThe left hand side navigation will be hidden until `navigationOpened`\nproperty is set.\nThe navigation will cover full screen, hiding the content.\nThis works best with `narrow` layout.",
           "sourceRange": {
             "start": {
-              "line": 490,
+              "line": 506,
               "column": 8
             },
             "end": {
-              "line": 490,
+              "line": 506,
               "column": 33
             }
           },
@@ -3425,11 +3471,11 @@
           "description": "True when navigation is opened.",
           "sourceRange": {
             "start": {
-              "line": 494,
+              "line": 510,
               "column": 8
             },
             "end": {
-              "line": 497,
+              "line": 513,
               "column": 9
             }
           },
@@ -3441,11 +3487,11 @@
           "description": "A width when the navigation drawer is automatically toggled to narrow\nview.\nBy default it is `640px`.\n\nTo control width of the navigation drawer, set `--app-drawer-width`\nCSS variable to requested size.",
           "sourceRange": {
             "start": {
-              "line": 506,
+              "line": 522,
               "column": 8
             },
             "end": {
-              "line": 506,
+              "line": 522,
               "column": 31
             }
           },
@@ -3457,11 +3503,11 @@
           "description": "Location of the `bower_components` folder.\nIt should be a path from server's root path including bower_components.",
           "sourceRange": {
             "start": {
-              "line": 519,
+              "line": 535,
               "column": 8
             },
             "end": {
-              "line": 519,
+              "line": 535,
               "column": 29
             }
           },
@@ -3473,11 +3519,11 @@
           "description": "OAuth2 redirect URI.\nBy default the app uses `bowerLocation` to compute redirect location\nURI. If you set this value if has to work with authorization\ncomponent meaning it has to pass auth data to the opener window or\ntop frame.\nSee documentation for `advanced-rest-client/oauth-authorization`\nfor API details.",
           "sourceRange": {
             "start": {
-              "line": 529,
+              "line": 545,
               "column": 8
             },
             "end": {
-              "line": 529,
+              "line": 545,
               "column": 27
             }
           },
@@ -3489,11 +3535,11 @@
           "description": "Hides the URL editor from the view.\nNote that the editor is still in the DOM. This property just hiddes\nit.",
           "sourceRange": {
             "start": {
-              "line": 535,
+              "line": 551,
               "column": 8
             },
             "end": {
-              "line": 535,
+              "line": 551,
               "column": 28
             }
           },
@@ -3505,11 +3551,11 @@
           "description": "A base URI for the API. To be set if RAML spec is missing `baseUri`\ndeclaration and this produces invalid URL input. This information\nis passed to the URL editor that prefixes the URL with `baseUri` value\nif passed URL is a relative URL.",
           "sourceRange": {
             "start": {
-              "line": 542,
+              "line": 558,
               "column": 8
             },
             "end": {
-              "line": 542,
+              "line": 558,
               "column": 23
             }
           },
@@ -3521,11 +3567,11 @@
           "description": "Removes the \"Powered by Mulesoft\" attribution from the main navigation.\nThe use of this feature must be in accordance with all licensing\nand copyright protections required by the use of this software",
           "sourceRange": {
             "start": {
-              "line": 548,
+              "line": 564,
               "column": 8
             },
             "end": {
-              "line": 551,
+              "line": 567,
               "column": 9
             }
           },
@@ -3537,11 +3583,11 @@
           "description": "Computed value of AMF model of a type of `http://schema.org/WebAPI`",
           "sourceRange": {
             "start": {
-              "line": 557,
+              "line": 573,
               "column": 8
             },
             "end": {
-              "line": 560,
+              "line": 576,
               "column": 9
             }
           },
@@ -3553,11 +3599,11 @@
           "description": "Computed title of the API",
           "sourceRange": {
             "start": {
-              "line": 564,
+              "line": 580,
               "column": 8
             },
             "end": {
-              "line": 567,
+              "line": 583,
               "column": 9
             }
           },
@@ -3569,11 +3615,11 @@
           "description": "If true then current browser is Chrome.\nUsed to determine if the console should render the extension banner.",
           "sourceRange": {
             "start": {
-              "line": 572,
+              "line": 588,
               "column": 8
             },
             "end": {
-              "line": 578,
+              "line": 594,
               "column": 9
             }
           },
@@ -3585,11 +3631,11 @@
           "description": "True when the main layout element renders in narrow view.\nThis changes when media query breakpoint has been reached or\nwhen narrow property is set.",
           "sourceRange": {
             "start": {
-              "line": 584,
+              "line": 600,
               "column": 8
             },
             "end": {
-              "line": 587,
+              "line": 603,
               "column": 9
             }
           },
@@ -3601,11 +3647,11 @@
           "description": "An alignment of the layout drawer.\nPossible values are:\n- start\n- end\n\nDefault to \"start\".",
           "sourceRange": {
             "start": {
-              "line": 596,
+              "line": 612,
               "column": 8
             },
             "end": {
-              "line": 596,
+              "line": 612,
               "column": 27
             }
           },
@@ -3617,11 +3663,11 @@
           "description": "If set the top toolbars are not rendered.",
           "sourceRange": {
             "start": {
-              "line": 600,
+              "line": 616,
               "column": 8
             },
             "end": {
-              "line": 603,
+              "line": 619,
               "column": 9
             }
           },
@@ -3633,11 +3679,11 @@
           "description": "By default API console renders itself as an embeddable\nweb component that has changed behavior of main layout elements\n(menu drawer and main view). When this option is set it renders\nlayout elements in it's static positions instead relative.\n\nNote, this option is experimental and mey be removed.",
           "sourceRange": {
             "start": {
-              "line": 612,
+              "line": 628,
               "column": 8
             },
             "end": {
-              "line": 615,
+              "line": 631,
               "column": 9
             }
           },
@@ -3649,11 +3695,11 @@
           "description": "When true it places try it panel next to the documentation panel.\nIt is set automatically via media queries",
           "sourceRange": {
             "start": {
-              "line": 620,
+              "line": 636,
               "column": 8
             },
             "end": {
-              "line": 620,
+              "line": 636,
               "column": 27
             }
           },
@@ -3665,11 +3711,11 @@
           "description": "If set then it renders methods documentation inline with\nthe endpoint documentation.\nWhen it's not set (or value is `false`, default) then it renders\njust a list of methods with links in the documentation panel",
           "sourceRange": {
             "start": {
-              "line": 627,
+              "line": 643,
               "column": 8
             },
             "end": {
-              "line": 627,
+              "line": 643,
               "column": 52
             }
           },
@@ -3681,11 +3727,11 @@
           "description": "Computed value from the method model, name of the method.\nIt is either a `displayName` or HTTP method name",
           "sourceRange": {
             "start": {
-              "line": 643,
+              "line": 659,
               "column": 8
             },
             "end": {
-              "line": 646,
+              "line": 662,
               "column": 9
             }
           },
@@ -3697,11 +3743,11 @@
           "description": "Scroll target used to observe `scroll` events.\nSet it to a parent element that is a scroll region (has overflow set)\nso the app can handle scrolling properly.",
           "sourceRange": {
             "start": {
-              "line": 652,
+              "line": 668,
               "column": 8
             },
             "end": {
-              "line": 652,
+              "line": 668,
               "column": 28
             }
           },
@@ -3713,11 +3759,11 @@
           "description": "Option passed to the try it panel.\nWhen set it allows to disable parameters in an editor (headers,\nquery parameters). Disabled parameter won't be used with a test call\nbut won't be removed from the UI.",
           "sourceRange": {
             "start": {
-              "line": 659,
+              "line": 675,
               "column": 8
             },
             "end": {
-              "line": 659,
+              "line": 675,
               "column": 35
             }
           },
@@ -3729,11 +3775,11 @@
           "description": "Option passed to the try it panel.\nWhen set, editors renders \"add custom\" button that allows to define\ncustom parameters next to API spec defined.",
           "sourceRange": {
             "start": {
-              "line": 665,
+              "line": 681,
               "column": 8
             },
             "end": {
-              "line": 665,
+              "line": 681,
               "column": 28
             }
           },
@@ -3745,11 +3791,11 @@
           "description": "Option passed to the try it panel.\nEnables auto hiding of optional properties (like query parameters\nor headers) and renders a checkbox to render optional items in the\neditor view.",
           "sourceRange": {
             "start": {
-              "line": 672,
+              "line": 688,
               "column": 9
             },
             "end": {
-              "line": 672,
+              "line": 688,
               "column": 35
             }
           },
@@ -3761,11 +3807,11 @@
           "description": "Prohibits rendering documentation (the icon and the\ndescription) in request editors.",
           "sourceRange": {
             "start": {
-              "line": 677,
+              "line": 693,
               "column": 9
             },
             "end": {
-              "line": 677,
+              "line": 693,
               "column": 24
             }
           },
@@ -3777,11 +3823,11 @@
           "description": "A HTML element used to listen for events on.\nIf you use one than more API console elements on single page\nat the same time wrap the console is a HTML element (eg div) and\nset this value to the container so the request panel only listen\nto events dispatched inside the container. Otherwise events dispatched\nby the request panel will be handled by other instances of the console.",
           "sourceRange": {
             "start": {
-              "line": 687,
+              "line": 703,
               "column": 9
             },
             "end": {
-              "line": 687,
+              "line": 703,
               "column": 29
             }
           },
@@ -3825,11 +3871,11 @@
           "name": "content",
           "range": {
             "start": {
-              "line": 215,
+              "line": 230,
               "column": 10
             },
             "end": {
-              "line": 215,
+              "line": 230,
               "column": 38
             }
           }
diff --git a/api-console.d.ts b/api-console.d.ts
index 479b2f257..eabc87250 100644
--- a/api-console.d.ts
+++ b/api-console.d.ts
@@ -141,6 +141,7 @@ declare namespace MulesoftApps {
      * When set the extension banner is rendered.
      */
     readonly extensionBannerActive: boolean|null|undefined;
+    _hasApicCorsExtension: boolean|null|undefined;
 
     /**
      * Forces the console to send headers defined in this string overriding
@@ -473,6 +474,7 @@ declare namespace MulesoftApps {
      * @param value Current value of `noExtensionBanner` property
      */
     _noExtBannerChanged(value: Boolean|null): void;
+    _hasCorsExtensionChanged(value: any): void;
 
     /**
      * Computes value of `isMethod` proiperty.
diff --git a/api-console.html b/api-console.html
index 6fe8d8268..c716f7686 100644
--- a/api-console.html
+++ b/api-console.html
@@ -298,7 +298,7 @@ <h1 class="method-title">[[methodName]]</h1>
       <raml-aware raml="{{amfModel}}" scope="[[aware]]"></raml-aware>
     </template>
     <paper-toast class="error-toast" id="apiLoadErrorToast"></paper-toast>
-    <api-console-ext-comm has-extension="{{noExtensionBanner}}"></api-console-ext-comm>
+    <api-console-ext-comm has-extension="{{_hasApicCorsExtension}}"></api-console-ext-comm>
     <!--
     The components below are optional dependencies. They will not be used until
     sources of the components are included into AC bundle.
@@ -454,6 +454,7 @@ <h1 class="method-title">[[methodName]]</h1>
           type: Boolean,
           readOnly: true
         },
+        _hasApicCorsExtension: {type: Boolean, observer: '_hasCorsExtensionChanged'},
         /**
          * Forces the console to send headers defined in this string overriding
          * any used defined header.
@@ -816,7 +817,7 @@ <h1 class="method-title">[[methodName]]</h1>
         return;
       }
       setTimeout(() => {
-        if (!this.noExtensionBanner) {
+        if (!this.noExtensionBanner && !this._hasApicCorsExtension) {
           this._setExtensionBannerActive(true);
         }
       });
@@ -890,6 +891,11 @@ <h1 class="method-title">[[methodName]]</h1>
         this._setExtensionBannerActive(false);
       }
     }
+    _hasCorsExtensionChanged(value) {
+      if (value && this.extensionBannerActive) {
+        this._setExtensionBannerActive(false);
+      }
+    }
     /**
      * Computes value of `isMethod` proiperty.
      * @param {String} selectedShapeType Current value of `selectedShapeType`
diff --git a/bower.json b/bower.json
index 3dfed986e..41983a5d8 100644
--- a/bower.json
+++ b/bower.json
@@ -5,7 +5,7 @@
     "Pawel Psztyc",
     "The Advanced REST client authors <arc@mulesoft.com>"
   ],
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "keywords": [
     "web-components",
     "polymer",
diff --git a/package-lock.json b/package-lock.json
index 3846b4a11..c5daf256d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 484d9f85a..58e7787fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "license": "CPAL-1.0",
   "description": "The API console used in RAML platform.",
   "devDependencies": {
diff --git a/test/basic-test.html b/test/basic-test.html
index 1675e9743..8ed77ea53 100644
--- a/test/basic-test.html
+++ b/test/basic-test.html
@@ -56,8 +56,8 @@
       assert.isTrue(element.isDocs);
     });
 
-    test('noExtensionBanner is false by default', function() {
-      assert.isFalse(element.noExtensionBanner);
+    test('noExtensionBanner is not set by default', function() {
+      assert.isUndefined(element.noExtensionBanner);
     });
 
     test('extensionBannerActive is not initally set', function() {
diff --git a/test/cors-extension-banner-test.html b/test/cors-extension-banner-test.html
new file mode 100644
index 000000000..b051b5c2b
--- /dev/null
+++ b/test/cors-extension-banner-test.html
@@ -0,0 +1,101 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+    <link rel="import" href="../../raml-aware/raml-aware.html">
+    <link rel="import" href="../../arc-polyfills/arc-polyfills.html">
+    <link rel="import" href="../api-console.html">
+    <script src="amf-loader.js"></script>
+  </head>
+  <body>
+
+    <test-fixture id="Basic">
+      <template>
+        <api-console></api-console>
+      </template>
+    </test-fixture>
+
+    <test-fixture id="NoExtension">
+      <template>
+        <api-console no-extension-banner></api-console>
+      </template>
+    </test-fixture>
+
+    <script>
+    suite('Declarative use', () => {
+      test('extensionBannerActive is eventually set', (done) => {
+        const element = fixture('NoExtension');
+        element.page = 'request';
+        flush(() => {
+          assert.isUndefined(element.extensionBannerActive);
+          done();
+        });
+      });
+
+      test('The extension banner is not visible', (done) => {
+        const element = fixture('NoExtension');
+        element.page = 'request';
+        flush(() => {
+          const node = element.shadowRoot.querySelector('.extension-banner');
+          const result = getComputedStyle(node).display.trim();
+          assert.equal(result, 'none');
+          done();
+        });
+      });
+    });
+
+    suite('Banner flow', () => {
+      let element;
+      setup(() => {
+        element = fixture('Basic');
+        element.page = 'request';
+      });
+
+      test('extensionBannerActive is set', (done) => {
+        if (!element.isChrome) {
+          done();
+          return;
+        }
+        flush(() => {
+          assert.isTrue(element.extensionBannerActive);
+          done();
+        });
+      });
+
+      test('Renders extension banner', (done) => {
+        if (!element.isChrome) {
+          done();
+          return;
+        }
+        flush(() => {
+          const node = element.shadowRoot.querySelector('.extension-banner');
+          const result = getComputedStyle(node).display.trim();
+          assert.notEqual(result, 'none');
+          done();
+        });
+      });
+
+      test('The banner is hidden when extension is detected', (done) => {
+        if (!element.isChrome) {
+          done();
+          return;
+        }
+        window.postMessage({
+          'api-console-payload': 'init',
+          'api-console-extension': true
+        }, location.origin);
+        flush(() => {
+          assert.isUndefined(element.extensionBannerActive);
+          const node = element.shadowRoot.querySelector('.extension-banner');
+          const result = getComputedStyle(node).display.trim();
+          assert.equal(result, 'none');
+          done();
+        });
+      });
+    });
+    </script>
+  </body>
+</html>
diff --git a/test/index.html b/test/index.html
index 5ea210103..f4343a3c8 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,7 @@
         'raml-aware-test.html',
         'amf-computations-test.html',
         'attribution-test.html',
+        'cors-extension-banner-test.html',
         'integration-test.html'
       ]);
     </script>