diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
index fe5de311f..4f41c0e78 100644
--- a/CONST_create_template/env.default
+++ b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.19
+GEOMAPFISH_VERSION=2.9.rc.21
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
diff --git a/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako b/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako
index 25e759ed8..b37d9bfb0 100644
--- a/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako
+++ b/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako
@@ -198,6 +198,40 @@
       <gmf-lidar-panel slot="tool-panel-lidar"></gmf-lidar-panel>
       <gmf-lidar-footer id="lidar-footer" slot="footer-lidar"></gmf-lidar-footer>
 
+      <!-- Google Street View -->
+      <gmf-googlestreetview-button slot="tool-button"></gmf-googlestreetview-button>
+      <div slot="tool-panel-googlestreetview" class="row pointer-events-none gmf-streetview-panel">
+        <div class="col-sm-12">
+          <div class="gmf-app-tools-content-heading">
+            {{ 'Google Street View' | translate }}
+          </div>
+          <ngeo-streetview
+            active="mainCtrl.googleStreetViewActive"
+            feature-style="mainCtrl.streetViewStyle"
+            map="mainCtrl.map"
+            panel-width="mainCtrl.toolsPanelWidth"
+            options-name="ngeoGoogleStreetviewOptions" class="pointer-events-auto">
+          </ngeo-streetview>
+        </div>
+      </div>
+
+      <!-- Mapillary -->
+      <gmf-mapillary-button slot="tool-button"></gmf-mapillary-button>
+      <div slot="tool-panel-mapillary" class="row pointer-events-none gmf-streetview-panel">
+        <div class="col-sm-12">
+          <div class="gmf-app-tools-content-heading">
+            {{ 'Mapillary Street View' | translate }}
+          </div>
+          <ngeo-streetview
+            active="mainCtrl.mapillaryStreetViewActive"
+            feature-style="mainCtrl.streetViewStyle"
+            map="mainCtrl.map"
+            panel-width="mainCtrl.toolsPanelWidth"
+            options-name="ngeoStreetviewOptions" class="pointer-events-auto">
+          </ngeo-streetview>
+        </div>
+      </div>
+
       <!-- Selection -->
       <gmf-selection-button slot="tool-button"></gmf-selection-button>
       <div slot="tool-panel-selection"  class="row pointer-events-none">
@@ -221,6 +255,19 @@
         </div>
       </div>
 
+      <!-- Routing -->
+      <gmf-routing-button slot="tool-button"></gmf-routing-button>
+      <div slot="tool-panel-routing" class="row pointer-events-none">
+        <div class="col-sm-12">
+          <div class="gmf-app-tools-content-heading">
+            {{ 'Routing' | translate }}
+          </div>
+          <ngeo-routing
+            ngeo-routing-map="mainCtrl.map" class="pointer-events-auto">
+          </ngeo-routing>
+        </div>
+      </div>
+
       <!-- Permalink -->
       <span slot="tool-button-separate">
         <button ngeo-btn class="btn btn-default gmf-app-tools-bar" ng-model="mainCtrl.modalShareShown"  data-toggle="tooltip" data-placement="left" data-original-title="{{'Share this map'|translate}}">
diff --git a/env.default b/env.default
index fe5de311f..4f41c0e78 100644
--- a/env.default
+++ b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.19
+GEOMAPFISH_VERSION=2.9.rc.21
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish