diff --git a/arch/clustering.html b/arch/clustering.html
index 2102369..7bab869 100644
--- a/arch/clustering.html
+++ b/arch/clustering.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/arch/clustering.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/arch/multi-tier-storage.html b/arch/multi-tier-storage.html
index 8ff15c6..d4debb7 100644
--- a/arch/multi-tier-storage.html
+++ b/arch/multi-tier-storage.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/arch/multi-tier-storage.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/arch/native-persistence.html b/arch/native-persistence.html
index 25d3c6c..4e38677 100644
--- a/arch/native-persistence.html
+++ b/arch/native-persistence.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/arch/native-persistence.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/community/contribute.html b/community/contribute.html
index 490d78a..ae85a6a 100644
--- a/community/contribute.html
+++ b/community/contribute.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/community/contribute.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/community/resources.html b/community/resources.html
index bf83611..81bfed0 100644
--- a/community/resources.html
+++ b/community/resources.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/community/resources.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/docs-and-apis.html b/docs-and-apis.html
index 544175d..3cd582f 100644
--- a/docs-and-apis.html
+++ b/docs-and-apis.html
@@ -34,7 +34,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/docs-and-apis.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/download.html b/download.html
index 56f5eb8..ad483d4 100644
--- a/download.html
+++ b/download.html
@@ -35,7 +35,20 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/download.html"/>
-    <meta charset="utf-8">
+    
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-61232409-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-61232409-1');
+</script>
+
+
+
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
@@ -44,18 +57,17 @@
 
 
     <!-- begin include include of "/includes/styles.html" -->
-<!-- remember to copy this content to downloads.html --><style>@charset "UTF-8";:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#055799;--secondary:#b02032;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--gray:#e9e9e9;--shadow-gray:#d5d5d5;--ignite-red:#f20025;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%}header,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}h1,h2,h3{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}ul{margin-top:0;margin-bottom:1rem}ul ul{margin-bottom:0}strong{font-weight:bolder}a{color:#055799;text-decoration:none;background-color:transparent}a:not([href]){color:inherit;text-decoration:none}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}button{border-radius:0}button{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button{overflow:visible}button{text-transform:none}[type=button],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}h1,h2,h3{margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:2.5rem}h2{font-size:2rem}h3{font-size:1.75rem}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.row{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.col-lg-5,.col-lg-7,.col-md-4,.col-md-6,.col-md-8{position:relative;width:100%;padding-right:15px;padding-left:15px}@media (min-width:768px){.col-md-4{flex:0 0 33.33333%;max-width:33.33333%}.col-md-6{flex:0 0 50%;max-width:50%}.col-md-8{flex:0 0 66.66667%;max-width:66.66667%}}@media (min-width:992px){.col-lg-5{flex:0 0 41.66667%;max-width:41.66667%}.col-lg-7{flex:0 0 58.33333%;max-width:58.33333%}}.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem}.btn-primary{color:#fff;background-color:#055799;border-color:#055799}.btn-secondary{color:#fff;background-color:#b02032;border-color:#b02032}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.dropdown{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.nav-link{display:block;padding:.5rem 1rem}.navbar{position:relative;display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;padding:.5rem 1rem}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-nav{display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (min-width:992px){.navbar-expand-lg{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}button.close{padding:0;background-color:transparent;border:0;appearance:none}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem}.modal.fade .modal-dialog{transform:translate(0,-50px)}.modal-content{position:relative;display:flex;flex-direction:column;width:100%;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}}body{font-family:'Open Sans',sans-serif;font-size:14px;margin:0;padding:0;opacity:1!important}strong{font-weight:600}.sticky-top{box-shadow:0 4px 8px 0 #b5b5b5;background-color:#fff}#header #nav{padding:.5rem 0;margin-bottom:0!important}#header #nav .navbar-brand img{width:12rem}#header #nav .navbar-nav{position:absolute;right:0}#header #nav .navbar-nav>li.nav-item{font-size:16px;width:130px}#header #nav .navbar-nav li.nav-item a{display:inline-block;padding-right:1.3em;padding-left:1.3em}#header #nav .navbar-nav li.nav-item .dropdown-toggle:after{display:none}#header #nav .navbar-nav li.nav-item ul.dropdown-menu{padding:.5em 0 0 1.3em;box-shadow:0 5px 8px 0 #d5d5d5,0 -5px 8px 0 #d5d5d5;border-bottom:5px solid #f20025;border-radius:0}#header #nav .navbar-nav li.nav-item ul.dropdown-menu .dropdown-subtitle{font-weight:400;font-size:16px;margin-top:.6em;border-bottom:3px solid #e9e9e9;margin-bottom:.5em;padding-bottom:.5em}#header #nav .navbar-nav li.nav-item ul.dropdown-menu .dropdown-item{padding:0}#header #nav .navbar-nav li.nav-item ul.dropdown-menu .dropdown-item a{padding:.4em 1.5em .4em 1em;color:#000;font-size:14px;display:block}#header #nav .navbar-nav li.nav-item ul.dropdown-menu .dropdown-item:last-child{border-bottom:5px solid #b02032;padding-bottom:1em;margin-bottom:-5px}#header.shrink #nav .navbar-nav>li.nav-item{width:120px}#header.shrink .btn-secondary{padding:.3rem 1.2rem .4rem!important}#header.shrink img{width:8rem!important}.bg-gray-shadow{background-color:#e9e9e9}#main-banner{box-shadow:inset 0 15px 8px -10px #d5d5d5,inset 0 -15px 8px -10px #d5d5d5}#main-banner .wrapper{background:#187ccc;background:-moz-linear-gradient(45deg,#187ccc 0,#0a5a9a 14%,rgba(242,242,242,0) 14%,rgba(242,242,242,0) 80%,#0a5a9a 80%,#187ccc 100%);background:-webkit-linear-gradient(45deg,#187ccc 0,#0a5a9a 14%,rgba(242,242,242,0) 14%,rgba(242,242,242,0) 80%,#0a5a9a 80%,#187ccc 100%);background:linear-gradient(45deg,#187ccc 0,#0a5a9a 14%,rgba(242,242,242,0) 14%,rgba(242,242,242,0) 80%,#0a5a9a 80%,#187ccc 100%);padding:5em 0}#main-banner h1{font-weight:300;font-size:32px;line-height:1.4em;text-align:center}#main-banner h1 strong{display:block}#main-banner .btn{font-size:18px;line-height:1.5em;padding:.5rem 1.5rem;margin-right:30px}#main-banner .btn i{font-size:24px;margin-right:8px;vertical-align:middle}#main-banner .buttons{text-align:center;margin-top:3rem}#github-stats-bar{padding:.5rem 0 .2rem;background-color:#f6f6f6}#github-stats-bar a{color:#f6f6f6}.github-stats .github-link .fa-github{color:#055799;font-size:30px;margin-right:1rem;vertical-align:top}#intro-text{padding:5rem 0 0;box-shadow:inset 0 15px 8px -10px #d5d5d5}#intro-text p{border-radius:5px;padding:0 10rem;font-size:24px;text-align:center;margin-bottom:0;font-weight:300}#home-deployment-options{box-shadow:inset 0 -15px 8px -10px #d5d5d5;padding:4rem 0 3rem;background:#fff;background:linear-gradient(180deg,#fff 0,#e9e9e9 30%)}#home-deployment-options h2{margin-bottom:3rem}#home-deployment-options .row{padding:0 3rem}#home-deployment-options .row .option{padding:0 40px}#home-deployment-options .row a{display:block;text-align:center;color:#000;margin-bottom:3em}#home-deployment-options .row a h3{font-size:20px;line-height:1.5em;font-weight:600}#home-deployment-options .row a p{font-size:16px;font-weight:400;line-height:1.6em}#home-deployment-options .row a .icon-wrapper{border-radius:50px;padding:1.5rem;background-color:#b02032;margin:1rem auto 2rem;width:100px;height:100px}#home-deployment-options .row a .icon-wrapper>svg{width:100%;height:100%;fill:#fff}#home-use-cases{padding:5rem 0;background-color:#fff}#home-use-cases .container .row{margin-bottom:2rem;margin-top:4rem}#home-use-cases .container img{max-width:100%;margin:0 auto;display:block}#home-use-cases .container .txt-wrapper{display:block;padding:30px}#home-use-cases .container .txt-wrapper h3{font-size:20px;margin-bottom:15px;font-weight:600}#home-use-cases .container .txt-wrapper p{font-size:16px;line-height:2em;margin-bottom:20px}#home-use-cases .container .txt-wrapper .btn{padding:8px 15px}.modal-dialog .modal-content button.close{width:40px;position:absolute;right:10px;top:10px}#diagramModal .modal-dialog{max-width:90vw!important}#diagramModal .modal-dialog .modal-content{height:95vh}#diagramModal .modal-dialog .modal-content img{height:95vh;max-width:60vw;margin:0 auto}section.section-block h2{text-align:center;font-size:32px;text-transform:uppercase;margin-bottom:2em}section.section-block h2 strong{color:#055799;font-weight:900}@media (max-width:1400px){#main-banner .wrapper{background:-moz-linear-gradient(45deg,#187ccc 0,#0a5a9a 9%,rgba(242,242,242,0) 9%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:-webkit-linear-gradient(45deg,#187ccc 0,#0a5a9a 9%,rgba(242,242,242,0) 9%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:linear-gradient(45deg,#187ccc 0,#0a5a9a 9%,rgba(242,242,242,0) 9%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%)}}@media (max-width:1280px){#main-banner .wrapper{background:-moz-linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:-webkit-linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%)}}@media (max-width:1199.98px){#main-banner .wrapper{background:-moz-linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:-webkit-linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%);background:linear-gradient(45deg,#187ccc 0,#0a5a9a 7%,rgba(242,242,242,0) 7%,rgba(242,242,242,0) 90%,#0a5a9a 90%,#187ccc 100%)}#intro-text p{padding:0}}@media (max-width:991.98px){#intro-text p{font-size:20px}#home-deployment-options .row a svg{width:85px;height:85px}#home-deployment-options .row a h3{font-size:18px}#home-deployment-options .row a p{font-size:14px}#home-deployment-options .row .option{padding:0 25px!important}#header #nav .navbar-nav{position:relative}#header #nav .navbar-nav li.nav-item a.btn{margin-left:1.3em}#header #nav .navbar-nav li.nav-item ul.dropdown-menu{border:0;box-shadow:none;margin-bottom:2rem;margin-left:2rem;border-left:5px solid #b02032}#header #nav .navbar-nav li.nav-item ul.dropdown-menu .dropdown-item:last-child{border-bottom:none}#header #nav .navbar-brand img{width:9rem}#header #nav .navbar-toggler-icon i{font-size:2rem}#header.shrink #nav .navbar-nav>li.nav-item{width:100%}}@media (max-width:767.98px){.twitter-follow{display:none}#main-banner .wrapper{background:-moz-linear-gradient(45deg,#187ccc 0,#0a5a9a 5%,rgba(242,242,242,0) 5%,rgba(242,242,242,0) 95%,#0a5a9a 95%,#187ccc 100%);background:-webkit-linear-gradient(45deg,#187ccc 0,#0a5a9a 5%,rgba(242,242,242,0) 5%,rgba(242,242,242,0) 95%,#0a5a9a 95%,#187ccc 100%);background:linear-gradient(45deg,#187ccc 0,#0a5a9a 5%,rgba(242,242,242,0) 5%,rgba(242,242,242,0) 95%,#0a5a9a 95%,#187ccc 100%)}}@media (max-width:575.98px){#main-banner h1{font-size:26px;text-align:center}#main-banner .buttons{text-align:center;align-items:center}#main-banner .btn{margin-bottom:10px}#home-use-cases h2 strong{display:block}}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-check-square-o:before{content:"\f046"}.fa-external-link:before{content:"\f08e"}.fa-github:before{content:"\f09b"}.fa-bars:before{content:"\f0c9"}body {opacity: 0;}.fa{display: none;}</style>
 
     <!-- ***NOTICE***
          As of 2015-08-31, SSI does not work with the "virtual"
          downloads.cgi hack. Therefore, we're including the banners,
          navbars and notices explicitly. -->
     
-
 </head>
 <body class="line-numbers">
 <!-- begin include of "/includes/header.html" -->
 
+
 <header id="header" class="affix header sticky-top shrink" data-spy="affix" data-offset-top="0">
     <div class="container">
         <nav id="nav" class=" navbar navbar-expand-lg d-flex bd-highlight mb-3" role="navigation">
@@ -63,7 +75,7 @@
                     src="/images/ignite_logo_full.svg" alt="Apache Ignite Logo"></a>
 
 
-            <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar">
+            <button aria-label="Main Menu" type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar">
                         <span class="navbar-toggler-icon"><i class="fas fa-bars" aria-hidden="true"></i>
                         </span>
             </button>
@@ -78,33 +90,33 @@
 
                             <li class="dropdown-item"><a href="/arch/multi-tier-storage.html"
                                                          aria-label="Memory Centric Storage"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'memory_centric');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'memory_centric'});">
                                 Multi-Tier Storage</a>
                             </li>
                             <li class="dropdown-item"><a href="/arch/native-persistence.html"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'persistence'});">
                                 Native Persistence</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/sql.html" aria-label="Features"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_sql');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'distributed_sql'});">
                                 Distributed SQL</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/key-value-store.html" aria-label="DataGrid"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_key_value');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'distributed_key_value'});">
                                 Distributed Key-Value</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/acid-transactions.html" aria-label="Transactions"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'acid_transactions');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'acid_transactions'});">
                                 ACID Transactions</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/collocated-processing.html"
                                                          aria-label="Collocated Processing"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'collocated_processing');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'collocated_processing'});">
                                 Co-located Processing</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/machinelearning.html"
                                                          aria-label="Machine Learning"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'machine_learning');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'machine_learning'});">
                                 Machine Learning</a>
                             </li>
                             <li class="dropdown-item"><a href="/features.html"><i>More Features</i></a></li>
@@ -114,7 +126,7 @@
                             <li role="presentation" class="dropdown-subtitle">Tooling</li>
                             <li class="dropdown-item"><a href="/features/manageandmonitor.html"
                                                          aria-label="Ignite Management & Monitoring"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'ignite_manage_monitor');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'ignite_manage_monitor'});">
                                 Management & Monitoring</a>
                             </li>
                         </ul>
@@ -127,22 +139,22 @@
                             <li class="dropdown-subtitle" role="presentation">Caching & Database</li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-cache.html"
                                                          aria-label="In-Memory Cache"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'in_memory_cache');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'in_memory_cache'});">
                                 In-Memory Cache</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-data-grid.html"
                                                          aria-label="In-Memory Data Grid"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'data_grid');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'data_grid'});">
                                 In-Memory Data Grid</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-database.html"
                                                          aria-label="In-Memory Database"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'distributed-database'});">
                                 In-Memory Database</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/key-value-store.html"
                                                          aria-label="Key-Value Store"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'key_value_store');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'key_value_store'});">
                                 Key-Value Store</a>
                             </li>
 
@@ -150,12 +162,11 @@
                             <li class="dropdown-subtitle" role="presentation">Data & Compute Hubs</li>
                             <li class="dropdown-item"><a href="/use-cases/high-performance-computing.html"
                                                          aria-label="High-Performance Computing"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'massive_parallel_processing');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'massive_parallel_processing'});">
                                 High-Performance Computing</a>
                             </li>
-                            <li class="dropdown-item"><a href="/use-cases/digital-integration-hub.html"
-                                                         aria-label="Digital Integration Hub"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'digital_integration_hub');">
+                            <li class="dropdown-item"><a href="/use-cases/digital-integration-hub.html" aria-label="Digital Integration Hub"
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'digital_integration_hub'});">
                                 Digital Integration Hub</a>
                             </li>
 
@@ -163,12 +174,12 @@
                             <li class="dropdown-subtitle" role="presentation">Faster Analytics</li>
                             <li class="dropdown-item"><a href="/use-cases/spark-acceleration.html"
                                                          aria-label="Apache Spark Acceleration"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'apache_spark_acceleration');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'apache_spark_acceleration'});">
                                 Apache Spark Acceleration</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/hadoop-acceleration.html"
                                                          aria-label="Hadoop Acceleration"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hadoop_acceleration');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'hadoop_acceleration'});">
                                 Apache Hadoop Acceleration</a>
                             </li>
 
@@ -176,7 +187,7 @@
                             <li class="dropdown-subtitle" role="presentation">Ignite in Production</li>
                             <li class="dropdown-item"><a href="/use-cases/provenusecases.html"
                                                          aria-label="Powered by Ignite"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'proven_usecases'});">
                                 Powered by Ignite</a>
                             </li>
                         </ul>
@@ -202,19 +213,17 @@
                             <li class="dropdown-subtitle" role="presentation">FAQ & Assets</li>
                             <li class="dropdown-item">
                                 <a href="/in-memory-computing.html" aria-label="whats-imc"
-                                   onclick="ga('send', 'event', 'whats-imc', 'menu_click', 'whats-imc');">
+                                   onclick="gtag('event', 'menu_click', { 'event_category': 'whats-imc', 'event_label': 'whats-imc'});">
                                     What's In-Memory Computing?</a>
                             </li>
                             <li class="dropdown-item">
                                 <a href="/whatisignite.html" aria-label="whats-ignite"
-                                   onclick="ga('send', 'event', 'whatisignite', 'menu_click', 'whatisignite_page');">
+                                   onclick="gtag('event',  'menu_click', { 'event_category': 'whatisignite', 'event_label': 'whatisignite_page'});">
                                     What's Apache Ignite?</a>
                             </li>
                             <li class="dropdown-item">
-                                <a href="https://github.com/apache/ignite-website/tree/master/images/png-diagrams"
-                                   aria-label="ignite-assets"
-                                   onclick="ga('send', 'event', 'ignite_assets', 'menu_click', 'ignite_assets');"
-                                   target="_blank">
+                                <a href="https://github.com/apache/ignite-website/tree/master/images/png-diagrams" aria-label="ignite-assets"
+                                   onclick="gtag('event',  'menu_click', { 'event_category': 'ignite_assets', 'event_label': 'ignite_assets'});" rel="noopener" target="_blank">
                                     Ignite Assets<i
                                         class="fas fa-external-link-alt" style="padding-left:5px;"></i></a>
                             </li>
@@ -270,6 +279,7 @@
 </header>
 
 
+
 <!-- end include of "/includes/header.html" -->
 
 <!-- START OF MAIN SITE BODY -->
@@ -347,7 +357,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="[preferred]/[distdir]/2.8.0/apache-ignite-2.8.0-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.8.0');">apache-ignite-2.8.0-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.8.0'});">apache-ignite-2.8.0-src.zip</a>
 
                         (<a href="https://downloads.apache.org/ignite/2.8.0/apache-ignite-2.8.0-src.zip.asc">pgp</a>,
                         <a href="https://downloads.apache.org/ignite/2.8.0/apache-ignite-2.8.0-src.zip.sha512">sha512</a>)
@@ -367,7 +377,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.7.6');">apache-ignite-2.7.6-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.7.6'});">apache-ignite-2.7.6-src.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-src.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-src.zip.sha512">sha512</a>)
@@ -387,7 +397,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.7.5');">apache-ignite-2.7.5-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.7.5'});">apache-ignite-2.7.5-src.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-src.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-src.zip.sha512">sha512</a>)
@@ -407,7 +417,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.7.0');">apache-ignite-2.7.0-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.7.0'});">apache-ignite-2.7.0-src.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-src.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-src.zip.sha512">sha512</a>)
@@ -427,7 +437,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-2.6.0-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.6.0');">apache-ignite-2.6.0-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.6.0'});">apache-ignite-2.6.0-src.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-2.6.0-src.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-2.6.0-src.zip.sha512">sha512</a>)
@@ -447,7 +457,7 @@
                     <td style="white-space: nowrap;">
                         <a id="apache_ignite_source_download"
                            href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-2.5.0-src.zip"
-                           onclick="ga('send', 'event', 'apache_ignite_source_download', 'download', 'apache-ignite-2.5.0');">apache-ignite-2.5.0-src.zip</a>
+                           onclick="gtag('event',  'download', {'event_category': 'apache_ignite_source_download', 'event_label': 'apache-ignite-2.5.0'});">apache-ignite-2.5.0-src.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-2.5.0-src.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-2.5.0-src.zip.sha512">sha512</a>)
@@ -519,7 +529,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="[preferred]/[distdir]/2.8.0/apache-ignite-2.8.0-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.8.0');">apache-ignite-2.8.0-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.8.0'});">apache-ignite-2.8.0-bin.zip</a>
 
                         (<a href="https://downloads.apache.org/ignite/2.8.0/apache-ignite-2.8.0-bin.zip.asc">pgp</a>,
                         <a href="https://downloads.apache.org/ignite/2.8.0/apache-ignite-2.8.0-bin.zip.sha512">sha512</a>)
@@ -539,7 +549,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.7.6');">apache-ignite-2.7.6-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.7.6'});">apache-ignite-2.7.6-bin.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-bin.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.6/apache-ignite-2.7.6-bin.zip.sha512">sha512</a>)
@@ -559,7 +569,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.7.5');">apache-ignite-2.7.5-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.7.5'});">apache-ignite-2.7.5-bin.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-bin.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.5/apache-ignite-2.7.5-bin.zip.sha512">sha512</a>)
@@ -579,7 +589,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.7.0');">apache-ignite-2.7.0-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.7.0'});">apache-ignite-2.7.0-bin.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-bin.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.7.0/apache-ignite-2.7.0-bin.zip.sha512">sha512</a>)
@@ -599,7 +609,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-fabric-2.6.0-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.6.0');">apache-ignite-fabric-2.6.0-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.6.0'});">apache-ignite-fabric-2.6.0-bin.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-fabric-2.6.0-bin.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-fabric-2.6.0-bin.zip.sha512">sha512</a>)
@@ -619,7 +629,7 @@
                         <a
                                 id="apache_ignite_binary_fabric_download"
                                 href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-fabric-2.5.0-bin.zip"
-                                onclick="ga('send', 'event', 'apache_ignite_fabric_download', 'download', 'apache-ignite-2.5.0');">apache-ignite-fabric-2.5.0-bin.zip</a>
+                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_fabric_download', 'event_label': 'apache-ignite-2.5.0'});">apache-ignite-fabric-2.5.0-bin.zip</a>
 
                         (<a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-fabric-2.5.0-bin.zip.asc">pgp</a>,
                         <a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-fabric-2.5.0-bin.zip.sha512">sha512</a>)
@@ -657,7 +667,7 @@
 <!--                        <a-->
 <!--                                id="apache_ignite_binary_hadoop_download"-->
 <!--                                href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-hadoop-2.6.0-bin.zip"-->
-<!--                                onclick="ga('send', 'event', 'apache_ignite_hadoop_download', 'download', 'apache-ignite-2.6.0');">apache-ignite-hadoop-2.6.0-bin.zip</a>-->
+<!--                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_hadoop_download', 'event_label': 'apache-ignite-2.6.0');">apache-ignite-hadoop-2.6.0-bin.zip</a>-->
 
 <!--                        (<a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-hadoop-2.6.0-bin.zip.asc">pgp</a>,-->
 <!--                        <a href="https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-hadoop-2.6.0-bin.zip.sha512">sha512</a>)-->
@@ -675,7 +685,7 @@
 <!--                        <a-->
 <!--                                id="apache_ignite_binary_hadoop_download"-->
 <!--                                href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-hadoop-2.5.0-bin.zip"-->
-<!--                                onclick="ga('send', 'event', 'apache_ignite_hadoop_download', 'download', 'apache-ignite-2.5.0');">apache-ignite-hadoop-2.5.0-bin.zip</a>-->
+<!--                                onclick="gtag('event',  'download', {'event_category': 'apache_ignite_hadoop_download', 'event_label': 'apache-ignite-2.5.0');">apache-ignite-hadoop-2.5.0-bin.zip</a>-->
 
 <!--                        (<a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-hadoop-2.5.0-bin.zip.asc">pgp</a>,-->
 <!--                        <a href="https://archive.apache.org/dist/ignite/2.5.0/apache-ignite-hadoop-2.5.0-bin.zip.sha512">sha512</a>)-->
@@ -709,7 +719,7 @@
                     <td style="white-space: nowrap;">
                         <a id="docker_repo_download"
                            href="https://hub.docker.com/r/apacheignite/ignite/tags/"
-                           onclick="ga('send', 'event', 'docker_repo_download', 'download', 'docker_repo_download');">https://hub.docker.com/r/apacheignite/ignite/tags</a>
+                           onclick="gtag('event',  'download', {'event_category': 'docker_repo_download', 'event_label': 'docker_repo_download'});">https://hub.docker.com/r/apacheignite/ignite/tags</a>
                     </td>
                 </tr>
                 <tr>
@@ -721,15 +731,15 @@
                     <td style="white-space: nowrap;">
                         <a id="aws_image_west_download"
                            href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-9cdbb3fc"
-                           onclick="ga('send', 'event', 'aws_image_west_download', 'download', 'aws_image_west_download');">https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-9cdbb3fc</a>
+                           onclick="gtag('event',  'download', {'event_category': 'aws_image_west_download', 'event_label': 'aws_image_west_download'});">https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-9cdbb3fc</a>
                         </br>
                         <a id="aws_image_east_download"
                            href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-ce82caa4"
-                           onclick="ga('send', 'event', 'aws_image_east_download', 'download', 'aws_image_east_download');">https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-ce82caa4</a>
+                           onclick="gtag('event',  'download', {'event_category': 'aws_image_east_download', 'event_label': 'aws_image_east_download'});">https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-ce82caa4</a>
                         </br>
                         <a id="aws_image_central_download"
                            href="https://console.aws.amazon.com/ec2/home?region=eu-central-1#launchAmi=ami-191b0775"
-                           onclick="ga('send', 'event', 'aws_image_central_download', 'download', 'aws_image_central_download');">https://console.aws.amazon.com/ec2/home?region=eu-central-1#launchAmi=ami-191b0775</a>
+                           onclick="gtag('event',  'download', {'event_category': 'aws_image_central_download', 'event_label': 'aws_image_central_download'});">https://console.aws.amazon.com/ec2/home?region=eu-central-1#launchAmi=ami-191b0775</a>
                     </td>
                 </tr>
                 <tr>
@@ -741,7 +751,7 @@
                     <td style="white-space: nowrap;">
                         <a id="gce_image_download"
                            href="https://storage.googleapis.com/ignite-media/ignite-google-image.tar.gz"
-                           onclick="ga('send', 'event', 'gce_image_download', 'download', 'gce_image_download');">ignite-google-image.tar.gz</a>
+                           onclick="gtag('event',  'download', {'event_category': 'gce_image_download', 'event_label': 'gce_image_download'});">ignite-google-image.tar.gz</a>
 
                         (<a href="https://downloads.apache.org/ignite/gce/ignite-google-image.tar.gz.asc">pgp</a>,
                         <a href="https://downloads.apache.org/ignite/gce/ignite-google-image.tar.gz.sha512">sha512</a>)
@@ -996,16 +1006,6 @@
 
 <!-- end of include "/includes/footer.html" -->
 
-<script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-61232409-1', 'auto');
-    ga('send', 'pageview');
-</script>
-
 <!-- include of "/includes/scripts.html" -->
 <link rel="stylesheet" href="/css/ignite-redesign.css?20200417" media="print" onload="this.media='all'">
 <noscript><link media="all" rel="stylesheet" href="/css/ignite-redesign.css?20200417"></noscript>
diff --git a/events.html b/events.html
index dc457a0..29ceb74 100644
--- a/events.html
+++ b/events.html
@@ -34,7 +34,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/events.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/features.html b/features.html
index 4f1fb30..eb47601 100644
--- a/features.html
+++ b/features.html
@@ -34,7 +34,8 @@
 <html xmlns="http://www.w3.org/1999/html">
 <head>
 <link rel="canonical" href="https://ignite.apache.org/features.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
@@ -62,39 +63,39 @@
                     <h3>Main Features</h3>
                     <ul>
                         <li><a href="/arch/multi-tier-storage.html" aria-label="Memory Centric"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'memory_centric');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'memory_centric'});">
                             Multi-Tier Storage</a>
                         </li>
                         <li><a href="/features/sql.html" aria-label="SQL"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'distributed_sql');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'distributed_sql'});">
                             Distributed SQL</a>
                         </li>
                         <li><a href="/use-cases/key-value-store.html" aria-label="Key-Value Store"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'distributed_key_value');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'distributed_key_value'});">
                             Distributed Key-Value</a>
                         </li>
                         <li><a href="/arch/native-persistence.html" aria-label="Persistence"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'persistence');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'persistence'});">
                             Native Persistence</a>
                         </li>
                         <li><a href="/features/acid-transactions.html" aria-label="Transactions"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'acid_transactions');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'acid_transactions'});">
                             ACID Transactions</a>
                         </li>
                         <li><a href="/features/collocated-processing.html" aria-label="Collocated Processing"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'collocated_processing');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'collocated_processing'});">
                             Co-located Processing</a>
                         </li>
                         <li><a href="/features/machinelearning.html" aria-label="Machine Learning"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'machine_learning');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'machine_learning'});">
                             Machine Learning</a>
                         </li>
                         <li><a href="/features/multilanguage.html" aria-label="Multi Language"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'multi_language');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'multi_language'});">
                             Multi-Language Support</a>
                         </li>
                         <li><a href="/arch/clustering.html" aria-label="Clusterig"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'clustering');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'clustering'});">
                             Deploy Anywhere</a>
                         </li>
                     </ul>
@@ -103,27 +104,27 @@
                     <h3>Extended Features</h3>
                     <ul>
                         <li><a href="/features/servicegrid.html" aria-label="Service Grid"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'service_grid');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'service_grid'});">
                             Service Grid</a>
                         </li>
                         <li><a href="/features/streaming.html" aria-label="Streaming"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'streaming');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'streaming'});">
                             Streaming</a>
                         </li>
                         <li><a href="/features/rdbmsintegration.html" aria-label="RDBMS integration"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'rdbms_integration');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'rdbms_integration'});">
                             RDBMS Integration</a>
                         </li>
                         <li><a href="/features/datastructures.html" aria-label="Data Structures"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'data_structures');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'data_structures'});">
                             Data Structures</a>
                         </li>
                         <li><a href="/features/messaging.html" aria-label="Messaging"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'messaging');">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'messaging'});">
                             Messaging & Events</a>
                         </li>
                         <li><a href="https://apacheignite-mix.readme.io/docs" aria-label="Messaging"
-                               onclick="ga('send', 'event', 'apache_ignite_features', 'features_page_click', 'other_integrations');" target="docs">
+                               onclick="gtag('event', 'features_page_click', {'event_category':'apache_ignite_features', 'event_label':'other_integrations'});" target="docs">
                             Other Integrations</a>
                         </li>
                     </ul>
@@ -133,12 +134,12 @@
                     <ul class="last">
                         <li><a href="/use-cases/spark-acceleration.html"
                                aria-label="Apache Spark Acceleration"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'apache_spark_acceleration');">
+                               onclick="gtag('event', 'menu_click', {'event_category':'apache_ignite_usecases', 'event_label':'apache_spark_acceleration'});">
                             Apache Spark Acceleration</a>
                         </li>
                         <li><a href="/use-cases/hadoop-acceleration.html"
                                aria-label="Hadoop Acceleration"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hadoop_acceleration');">
+                               onclick="gtag('event', 'menu_click', {'event_category':'apache_ignite_usecases', 'event_label':'hadoop_acceleration'});">
                             Apache Hadoop Acceleration</a>
                         </li>
                     </ul>
diff --git a/features/acid-transactions.html b/features/acid-transactions.html
index 79df397..188aba6 100644
--- a/features/acid-transactions.html
+++ b/features/acid-transactions.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/acid-transactions.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/collocated-processing.html b/features/collocated-processing.html
index 70472ef..2f602e4 100644
--- a/features/collocated-processing.html
+++ b/features/collocated-processing.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/collocated-processing.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/datastructures.html b/features/datastructures.html
index 88bdb8b..d3f5a9d 100644
--- a/features/datastructures.html
+++ b/features/datastructures.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/features/datastructures.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/machinelearning.html b/features/machinelearning.html
index c79a99d..8b6ac56 100644
--- a/features/machinelearning.html
+++ b/features/machinelearning.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/machinelearning.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/manageandmonitor.html b/features/manageandmonitor.html
index 345f6f0..5e8b2c8 100644
--- a/features/manageandmonitor.html
+++ b/features/manageandmonitor.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/datavisualization.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Apache Ignite&reg Management & Monitoring</title>
     <!--#include virtual="/includes/styles.html" -->
diff --git a/features/messaging.html b/features/messaging.html
index fd872c3..d9f6c72 100644
--- a/features/messaging.html
+++ b/features/messaging.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/features/messaging.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/multilanguage.html b/features/multilanguage.html
index 47a7025..7d8a2d6 100644
--- a/features/multilanguage.html
+++ b/features/multilanguage.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/multilanguage.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/rdbmsintegration.html b/features/rdbmsintegration.html
index ca74068..1ac4034 100644
--- a/features/rdbmsintegration.html
+++ b/features/rdbmsintegration.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/features/rdbmsintegration.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/servicegrid.html b/features/servicegrid.html
index ab84fdd..cb1e7c5 100644
--- a/features/servicegrid.html
+++ b/features/servicegrid.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/features/servicegrid.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/sql.html b/features/sql.html
index 6e82480..de35bfb 100644
--- a/features/sql.html
+++ b/features/sql.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/sql.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>Distributed ANSI SQL - Apache Ignite</title>
diff --git a/features/streaming.html b/features/streaming.html
index ff3aa64..4bec922 100644
--- a/features/streaming.html
+++ b/features/streaming.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/features/streaming.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/features/tensorflow.html b/features/tensorflow.html
index 4efacde..c7cad71 100644
--- a/features/tensorflow.html
+++ b/features/tensorflow.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/features/machinelearning.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/in-memory-computing.html b/in-memory-computing.html
index 7a038e4..deadbca 100644
--- a/in-memory-computing.html
+++ b/in-memory-computing.html
@@ -34,7 +34,8 @@
 <html lang="en">
 <head>
     <link rel="canonical" href="https://ignite.apache.org/in-memory-computing.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/includes/header.html b/includes/header.html
index 9261e45..a970a43 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -22,33 +22,33 @@
 
                             <li class="dropdown-item"><a href="/arch/multi-tier-storage.html"
                                                          aria-label="Memory Centric Storage"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'memory_centric');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'memory_centric'});">
                                 Multi-Tier Storage</a>
                             </li>
                             <li class="dropdown-item"><a href="/arch/native-persistence.html"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'persistence'});">
                                 Native Persistence</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/sql.html" aria-label="Features"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_sql');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'distributed_sql'});">
                                 Distributed SQL</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/key-value-store.html" aria-label="DataGrid"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_key_value');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'distributed_key_value'});">
                                 Distributed Key-Value</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/acid-transactions.html" aria-label="Transactions"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'acid_transactions');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'acid_transactions'});">
                                 ACID Transactions</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/collocated-processing.html"
                                                          aria-label="Collocated Processing"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'collocated_processing');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'collocated_processing'});">
                                 Co-located Processing</a>
                             </li>
                             <li class="dropdown-item"><a href="/features/machinelearning.html"
                                                          aria-label="Machine Learning"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'machine_learning');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'machine_learning'});">
                                 Machine Learning</a>
                             </li>
                             <li class="dropdown-item"><a href="/features.html"><i>More Features</i></a></li>
@@ -58,7 +58,7 @@
                             <li role="presentation" class="dropdown-subtitle">Tooling</li>
                             <li class="dropdown-item"><a href="/features/manageandmonitor.html"
                                                          aria-label="Ignite Management & Monitoring"
-                                                         onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'ignite_manage_monitor');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_features', 'event_label': 'ignite_manage_monitor'});">
                                 Management & Monitoring</a>
                             </li>
                         </ul>
@@ -71,22 +71,22 @@
                             <li class="dropdown-subtitle" role="presentation">Caching & Database</li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-cache.html"
                                                          aria-label="In-Memory Cache"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'in_memory_cache');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'in_memory_cache'});">
                                 In-Memory Cache</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-data-grid.html"
                                                          aria-label="In-Memory Data Grid"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'data_grid');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'data_grid'});">
                                 In-Memory Data Grid</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/in-memory-database.html"
                                                          aria-label="In-Memory Database"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'distributed-database'});">
                                 In-Memory Database</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/key-value-store.html"
                                                          aria-label="Key-Value Store"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'key_value_store');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'key_value_store'});">
                                 Key-Value Store</a>
                             </li>
 
@@ -94,11 +94,11 @@
                             <li class="dropdown-subtitle" role="presentation">Data & Compute Hubs</li>
                             <li class="dropdown-item"><a href="/use-cases/high-performance-computing.html"
                                                          aria-label="High-Performance Computing"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'massive_parallel_processing');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'massive_parallel_processing'});">
                                 High-Performance Computing</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/digital-integration-hub.html" aria-label="Digital Integration Hub"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'digital_integration_hub');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'digital_integration_hub'});">
                                 Digital Integration Hub</a>
                             </li>
 
@@ -106,12 +106,12 @@
                             <li class="dropdown-subtitle" role="presentation">Faster Analytics</li>
                             <li class="dropdown-item"><a href="/use-cases/spark-acceleration.html"
                                                          aria-label="Apache Spark Acceleration"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'apache_spark_acceleration');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'apache_spark_acceleration'});">
                                 Apache Spark Acceleration</a>
                             </li>
                             <li class="dropdown-item"><a href="/use-cases/hadoop-acceleration.html"
                                                          aria-label="Hadoop Acceleration"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hadoop_acceleration');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'hadoop_acceleration'});">
                                 Apache Hadoop Acceleration</a>
                             </li>
 
@@ -119,7 +119,7 @@
                             <li class="dropdown-subtitle" role="presentation">Ignite in Production</li>
                             <li class="dropdown-item"><a href="/use-cases/provenusecases.html"
                                                          aria-label="Powered by Ignite"
-                                                         onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
+                                                         onclick="gtag('event',  'menu_click', { 'event_category': 'apache_ignite_usecases', 'event_label': 'proven_usecases'});">
                                 Powered by Ignite</a>
                             </li>
                         </ul>
@@ -145,17 +145,17 @@
                             <li class="dropdown-subtitle" role="presentation">FAQ & Assets</li>
                             <li class="dropdown-item">
                                 <a href="/in-memory-computing.html" aria-label="whats-imc"
-                                   onclick="ga('send', 'event', 'whats-imc', 'menu_click', 'whats-imc');">
+                                   onclick="gtag('event', 'menu_click', { 'event_category': 'whats-imc', 'event_label': 'whats-imc'});">
                                     What's In-Memory Computing?</a>
                             </li>
                             <li class="dropdown-item">
                                 <a href="/whatisignite.html" aria-label="whats-ignite"
-                                   onclick="ga('send', 'event', 'whatisignite', 'menu_click', 'whatisignite_page');">
+                                   onclick="gtag('event',  'menu_click', { 'event_category': 'whatisignite', 'event_label': 'whatisignite_page'});">
                                     What's Apache Ignite?</a>
                             </li>
                             <li class="dropdown-item">
                                 <a href="https://github.com/apache/ignite-website/tree/master/images/png-diagrams" aria-label="ignite-assets"
-                                   onclick="ga('send', 'event', 'ignite_assets', 'menu_click', 'ignite_assets');" rel="noopener" target="_blank">
+                                   onclick="gtag('event',  'menu_click', { 'event_category': 'ignite_assets', 'event_label': 'ignite_assets'});" rel="noopener" target="_blank">
                                     Ignite Assets<i
                                         class="fas fa-external-link-alt" style="padding-left:5px;"></i></a>
                             </li>
diff --git a/includes/scripts.html b/includes/scripts.html
index 160f91a..a8458c9 100644
--- a/includes/scripts.html
+++ b/includes/scripts.html
@@ -28,15 +28,7 @@
 <script src="/js/bootstrap.min.js" ></script>
 <script src="/js/prism.js" ></script>
 
-<script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', 'UA-61232409-1', 'auto');
-    ga('send', 'pageview');
-</script>
 <script type="text/javascript">
     if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
         var msViewportStyle = document.createElement('style');
diff --git a/includes/scriptshead.html b/includes/scriptshead.html
new file mode 100644
index 0000000..70907be
--- /dev/null
+++ b/includes/scriptshead.html
@@ -0,0 +1,10 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-61232409-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-61232409-1');
+</script>
+
diff --git a/index.html b/index.html
index 5852b11..ac89329 100644
--- a/index.html
+++ b/index.html
@@ -35,12 +35,11 @@
     <link rel="canonical" href="https://ignite.apache.org/"/>
     <link rel="preconnect" href="https://api.github.com" />
     <link rel="preconnect" href="https://ajax.googleapis.com" />
-    <link rel="dns-prefetch" href="https://stats.g.doubleclick.net" />
-    <link rel="dns-prefetch" href="https://www.google-analytics.com" />
-    
+    <link rel="dns-prefetch" href="https://www.googletagmanager.com" />
     
 
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
@@ -160,7 +159,7 @@
             
                 <div class="buttons">
                     <a href="https://apacheignite.readme.io/docs/getting-started"
-                       onclick="ga('send', 'event', 'main_banner', 'homepage_click', 'getting-started');"
+                       onclick="gtag('event',  'homepage_click', {'event_category':'main_banner', 'event_label': 'getting-started'});"
                        class="btn btn-primary" rel="noopener" target="_blank"><i class="far fa-check-square"></i></i>
                         Getting Started
                     </a>
@@ -215,7 +214,7 @@
                 <div class="col-md-4 option">
                     <a aria-label="Apache Ignite In-Memory Cache"
                        href="/use-cases/in-memory-cache.html"
-                       onclick="ga('send', 'event', 'apache_ignite_dep_options', 'homepage_click', 'in-memory-cache');"
+                       onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_dep_options', 'event_label': 'in-memory-cache'});"
                        title="Apache Ignite In-Memory Cache">
                         <div class="icon-wrapper" style="padding-top: 1rem;"><svg>
                             <use xlink:href="#index-icons--Tachometer"></use>
@@ -230,7 +229,7 @@
                 <div class="col-md-4 option">
                     <a aria-label="" title="Apache Ignite In-Memory Data Grid"
                        href="/use-cases/in-memory-data-grid.html"
-                       onclick="ga('send', 'event', 'apache_ignite_dep_options', 'homepage_click', 'data_grid');" title="">
+                       onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_dep_options', 'event_label': 'data_grid'});" title="">
                         <div class="icon-wrapper"><svg>
                             <use xlink:href="#index-icons--IMDG"></use>
                         </svg></div>
@@ -244,7 +243,7 @@
                 <div class="col-md-4 option">
                     <a aria-label="" title="Apache Ignite In-Memory Database" 
                        href="/use-cases/in-memory-database.html"
-                       onclick="ga('send', 'event', 'apache_ignite_dep_options', 'homepage_click', 'database');" title="">
+                       onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_dep_options', 'event_label': 'database'});" title="">
                         <div class="icon-wrapper"><svg>
                             <use xlink:href="#index-icons--IMDB"></use>
                         </svg></div>
@@ -279,7 +278,7 @@
                         </p>
 
                         <a href="/use-cases/in-memory-data-grid.html"  role="button" class="btn btn-primary" title="In-Memory Data Grid" 
-                           onclick="ga('send', 'event', 'apache_ignite_use_cases', 'homepage_click', 'data_grid');">
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_use_cases', 'event_label': 'data_grid'});">
                            Learn More</a>
                     </div>
                 </div>
@@ -310,7 +309,7 @@
                         </p>
 
                         <a href="/use-cases/digital-integration-hub.html"  role="button" class="btn btn-primary" aria-label="Learn More About Digital Integration Hub" title="Digital Integration Hub"
-                           onclick="ga('send', 'event', 'apache_ignite_use_cases', 'homepage_click', 'digital_hub');">
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_use_cases', 'event_label': 'digital_hub'});">
                            Learn More</a>
                     </div>
                 </div>
@@ -344,7 +343,7 @@
                 <div class="row">
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/arch/multi-tier-storage.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'multi-tier-storage');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'multi-tier-storage'});"
                            title="Apache Ignite Multi-Tier Storage"
                            aria-label="Apache Ignite Multi-Tier Storage">
                             <svg>
@@ -359,7 +358,7 @@
                     </div>
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/features/sql.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'sql');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'sql'});"
                            title="" aria-label="">
                             <svg>
                                 <use xlink:href="#index-icons--Database"></use>
@@ -374,7 +373,7 @@
                     </div>
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/use-cases/key-value-store.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'key-value');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'key-value'});"
                            title="" aria-label="">
                             <svg>
                                 <use xlink:href="#index-icons--Multi-Model"></use>
@@ -388,7 +387,7 @@
                     </div>
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/features/acid-transactions.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'transactions');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'transactions'});"
                            title="" aria-label="">
                             <svg>
                                 <use xlink:href="#index-icons--ACID"></use>
@@ -403,7 +402,7 @@
                     </div>
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/features/collocated-processing.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'co-located-processsing');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'co-located-processsing'});"
                            title="" aria-label="">
                             <svg>
                                 <use xlink:href="#index-icons--Compute"></use>
@@ -418,7 +417,7 @@
                     </div>
                     <div class="col-sm-6 col-md-4 feature">
                         <a href="/features/machinelearning.html"
-                           onclick="ga('send', 'event', 'apache_ignite_features', 'homepage_click', 'machine-learning');"
+                           onclick="gtag('event',  'homepage_click', {'event_category':'apache_ignite_features', 'event_label': 'machine-learning'});"
                            title="" aria-label="">
                             <svg>
                                 <use xlink:href="#index-icons--Machine-Learning"></use>
diff --git a/meetup-groups.html b/meetup-groups.html
index 2f41a0b..c64b6eb 100644
--- a/meetup-groups.html
+++ b/meetup-groups.html
@@ -34,7 +34,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/meetup-groups.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/screencasts.html b/screencasts.html
index 7aeb364..08c7c01 100644
--- a/screencasts.html
+++ b/screencasts.html
@@ -34,7 +34,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/screencasts.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
     <meta http-equiv="Pragma" content="no-cache"/>
diff --git a/use-cases/caching/hibernate-l2-cache.html b/use-cases/caching/hibernate-l2-cache.html
index cc873db..00411d7 100644
--- a/use-cases/caching/hibernate-l2-cache.html
+++ b/use-cases/caching/hibernate-l2-cache.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/use-cases/caching/hibernate-l2-cache.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Hibernate Second-Level Cache Use Case - Apache Ignite</title>
     <!--#include virtual="/includes/styles.html" -->
diff --git a/use-cases/caching/jcache-provider.html b/use-cases/caching/jcache-provider.html
index eb9cd49..3e1b976 100644
--- a/use-cases/caching/jcache-provider.html
+++ b/use-cases/caching/jcache-provider.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/use-cases/caching/jcache-provider.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
diff --git a/use-cases/caching/web-session-clustering.html b/use-cases/caching/web-session-clustering.html
index 118e7eb..2d51244 100644
--- a/use-cases/caching/web-session-clustering.html
+++ b/use-cases/caching/web-session-clustering.html
@@ -35,7 +35,8 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/use-cases/caching/web-session-clustering.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Web Session Clustering - Apache Ignite</title>
     <!--#include virtual="/includes/styles.html" -->
diff --git a/use-cases/digital-integration-hub.html b/use-cases/digital-integration-hub.html
index b6a7621..1f5d769 100644
--- a/use-cases/digital-integration-hub.html
+++ b/use-cases/digital-integration-hub.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/digital-integration-hub.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/hadoop-acceleration.html b/use-cases/hadoop-acceleration.html
index 774a9ce..4827e88 100644
--- a/use-cases/hadoop-acceleration.html
+++ b/use-cases/hadoop-acceleration.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/hadoop-acceleration.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/high-performance-computing.html b/use-cases/high-performance-computing.html
index 628618a..f486cdb 100644
--- a/use-cases/high-performance-computing.html
+++ b/use-cases/high-performance-computing.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/high-performance-computing.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/in-memory-cache.html b/use-cases/in-memory-cache.html
index 6192c9e..7dc7f5e 100644
--- a/use-cases/in-memory-cache.html
+++ b/use-cases/in-memory-cache.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/in-memory-cache.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/in-memory-data-grid.html b/use-cases/in-memory-data-grid.html
index cb32e9e..4cb734f 100644
--- a/use-cases/in-memory-data-grid.html
+++ b/use-cases/in-memory-data-grid.html
@@ -34,7 +34,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/in-memory-data-grid.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/in-memory-database.html b/use-cases/in-memory-database.html
index f894b34..10b4045 100644
--- a/use-cases/in-memory-database.html
+++ b/use-cases/in-memory-database.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/in-memory-database.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/key-value-store.html b/use-cases/key-value-store.html
index e76d031..bf54188 100644
--- a/use-cases/key-value-store.html
+++ b/use-cases/key-value-store.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/database/key-value-store.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/use-cases/provenusecases.html b/use-cases/provenusecases.html
index fab77a7..cbc6b0c 100644
--- a/use-cases/provenusecases.html
+++ b/use-cases/provenusecases.html
@@ -35,6 +35,7 @@
 <head>
 
 <link rel="canonical" href="https://ignite.apache.org/use-cases/provenusecases.html" />
+<!--#include virtual="/includes/scriptshead.html" -->
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
diff --git a/use-cases/spark-acceleration.html b/use-cases/spark-acceleration.html
index 25ce0ed..de7bded 100644
--- a/use-cases/spark-acceleration.html
+++ b/use-cases/spark-acceleration.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/use-cases/spark-acceleration.html"/>
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="description"
diff --git a/whatisignite.html b/whatisignite.html
index 0621ae8..4570890 100644
--- a/whatisignite.html
+++ b/whatisignite.html
@@ -35,7 +35,8 @@
 <head>
 
     <link rel="canonical" href="https://ignite.apache.org/whatisignite.html" />
-    <meta charset="utf-8">
+    <!--#include virtual="/includes/scriptshead.html" -->
+<meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />