--- /usr/lib/drive-qml/models/AppSettingsModel.qml
+++ /usr/lib/drive-qml/models/AppSettingsModel.qml
@@ -20,7 +20,7 @@
         routeOptions: 63,
         serviceAgreedOn: "",
         ssoDone: false,
-        traffic: false, //true,  // TODO: change back when management makes up their mind
+        traffic: true,  // TODO: change back when management makes up their mind
         trafficUpdateInterval: 5,
         unitSystem: ""
     }
@@ -163,7 +163,7 @@
         gpsPowersaving = get('gpsPowersaving');
 
         // TODO: change back when management makes up their minds
-        trafficOn = false; //get('traffic');
+        trafficOn = get('traffic');
 
         mapSensorEnabled = get('mapSensor');
         trafficUpdateInterval = get('trafficUpdateInterval');
@@ -178,7 +178,7 @@
         Units.currentSystem = getUnitSystem();
 
         // TODO: change back when management makes up their minds
-        trafficOn = false; //get('allowConnections') && get('mapSensor') && get('traffic') && device.online;
+        trafficOn = get('allowConnections') && get('mapSensor') && get('traffic') && device.online;
     }
 
     Component.onCompleted: {
--- /usr/lib/drive-qml/views/assistancePage.qml
+++ /usr/lib/drive-qml/views/assistancePage.qml
@@ -91,7 +91,7 @@
             minimap.show();
 
             // TODO: Uncomment when management makes up their minds
-            //setupTraffic(false, restartTraffic);
+            setupTraffic(false, restartTraffic);
         } else {
             mapModel.center = minimap.map.center;
             minimap.startupInitialization();
@@ -117,15 +117,15 @@
 
             // TODO: Uncomment when management makes up their minds
             // Setup traffic after application startup
-            //setupTraffic(true, false);
+            setupTraffic(true, false);
             application.setup();
         }
     }
 
     onBeforeHide: {
         // TODO: Uncomment when management makes up their minds
-        //trafficModel.trafficError.disconnect(onTrafficError);
-        //trafficModel.trafficError.disconnect(onTrafficReady);
+        trafficModel.trafficError.disconnect(onTrafficError);
+        trafficModel.trafficError.disconnect(onTrafficReady);
         trackingHelper.pauseTracking();
         minimap.setTransitionMap();
         minimap.stopMapAnimation();
@@ -431,7 +431,7 @@
         name: (positioningModel && positioningModel.currentStreetName) ? positioningModel.currentStreetName : ""
         hasGPS: (positioningModel && positioningModel.hasGPS) ? positioningModel.hasGPS : false
         // TODO: Uncomment when management makes up their minds
-        loadingTraffic: false //(trafficModel && trafficModel.isLoadingTraffic) ? trafficModel.isLoadingTraffic : false
+        loadingTraffic: (trafficModel && trafficModel.isLoadingTraffic) ? trafficModel.isLoadingTraffic : false
     }
 
     // dashboard
--- /usr/lib/drive-qml/views/guidanceMenuPage.qml
+++ /usr/lib/drive-qml/views/guidanceMenuPage.qml
@@ -14,8 +14,8 @@
     property variant stopGuidanceDialog
 
     // TODO: Uncomment when management makes up their minds
-    //property string trafficTxt: modelFactory.getModel("AppSettingsModel").trafficOn ? qsTrId("qtn_drive_trafficoff_item") : qsTrId("qtn_drive_trafficon_item")
-    //property string trafficIcon: modelFactory.getModel("AppSettingsModel").trafficOn ? "traffic_off.png" : "traffic_on.png"
+    property string trafficTxt: modelFactory.getModel("AppSettingsModel").trafficOn ? qsTrId("qtn_drive_trafficoff_item") : qsTrId("qtn_drive_trafficon_item")
+    property string trafficIcon: modelFactory.getModel("AppSettingsModel").trafficOn ? "traffic_off.png" : "traffic_on.png"
 
     VisualItemModel {
         id: listModel
@@ -42,7 +42,7 @@
         }
 
         // TODO: Uncomment when management makes up their minds
-        /**
+        
         ButtonItem {
             id: toggletraffic
             itemId: "toggletraffic"
@@ -50,7 +50,7 @@
             iconUrl: Components.imagePath + "traffic/list_item/"+trafficIcon
             hideArrow: true
         }
-        */
+        
 
         ButtonItem {
             id: settings
--- /usr/lib/drive-qml/views/guidancePage.qml
+++ /usr/lib/drive-qml/guidancePage.qml
@@ -241,7 +241,7 @@
         name: (positioningModel && positioningModel.currentStreetName) ? positioningModel.currentStreetName : ""
         hasGPS: (positioningModel && positioningModel.hasGPS) ? positioningModel.hasGPS : false
         // TODO: Uncomment when management makes up their minds
-        loadingTraffic: false //trafficModel === undefined ? false : trafficModel.isLoadingTraffic
+        loadingTraffic: trafficModel === undefined ? false : trafficModel.isLoadingTraffic
     }
 
     Dashboard {
@@ -388,7 +388,7 @@
         }
 
         // TODO: Uncomment when management makes up their minds
-        //setupTraffic(firstShow);
+        setupTraffic(firstShow);
 
         minimap.initializeMap();                                        //gotta do it again because showOnMap will override our map settings
         page.state != "mapInteraction" && (guidanceModel.mapUpdateMode = Guidance.MAP_UPDATE_ROADVIEW);
@@ -399,8 +399,8 @@
 
     onBeforeHide: {
         // TODO: Uncomment when management makes up their minds
-        //trafficModel.trafficError.disconnect(onTrafficReady);
-        //trafficModel.trafficError.disconnect(onTrafficError);
+        trafficModel.trafficError.disconnect(onTrafficReady);
+        trafficModel.trafficError.disconnect(onTrafficError);
         guidanceModel.mapUpdateMode = Guidance.MAP_UPDATE_NONE;     //For the sake of transitions, stop the map movement
         minimap.setTransitionMap();
         minimap.stopMapAnimation();
--- /usr/lib/drive-qml/views/settings/assistanceModeSettingsPage.qml
+++ /usr/lib/drive-qml/views/settings/assistanceModeSettingsPage.qml
@@ -38,7 +38,7 @@
         ListElement { _itemId: "destination"; _targetPage: "locationPicker.qml" }
         ListElement { _itemId: "saveLocation"; _hideArrow: true }
 //        TODO: Uncomment when management makes up their minds
-//        ListElement { _itemId: "traffic_on"; _hideArrow: true }
+        ListElement { _itemId: "traffic_on"; _hideArrow: true }
         ListElement { _itemId: "settings"; _targetPage: "settings/settingsPage.qml" }
         ListElement { _itemId: "about"; _targetPage: "aboutPage.qml" }
         ListElement { _itemId: "feedback"; _targetPage: "npsPage.qml" }
--- /usr/lib/drive-qml/views/settings/settingsPage.qml
+++ /usr/lib/drive-qml/views/settings/settingsPage.qml
@@ -69,7 +69,7 @@
             subtitle: ""
         }
 
-        /** TODO: uncomment when management makes up their minds
+        
         ButtonItem {
             id: traffic
             itemId: "traffic"
@@ -77,7 +77,7 @@
             subtitle: trafficSettingsSubtitle();
             iconUrl: "../../resources/traffic/list_item/traffic_on.png"
         }
-        */
+        
 
         ButtonItem {
             id: home