diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml
index bc3c909847..b17ea4d99d 100644
--- a/.github/workflows/centos7.yml
+++ b/.github/workflows/centos7.yml
@@ -48,7 +48,7 @@ jobs:
 
     - name: Config OR-Tools URL
       run: |
-           echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/v9.2-rte2.1/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
+           echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
 
     - name: Download OR-Tools
       id: ortools
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index afe915dba0..4bc3330255 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -22,7 +22,7 @@ jobs:
       # https://sonarcloud.io/documentation/analysis/scan/sonarscanner/
       SONAR_SERVER_URL: "https://sonarcloud.io"
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
-      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.2-rte1.7/ortools_cxx_ubuntu-20.04_static_sirius.zip"
+      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip"
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 18b2564574..fc52b143ca 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -59,7 +59,7 @@ jobs:
 
     - name: Config OR-Tools URL
       run: |
-          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/v9.2-rte2.1/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
 
     - name: Download pre-compiled librairies
       uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
index 2e66a37770..1b00b39e4d 100644
--- a/.github/workflows/windows-release.yml
+++ b/.github/workflows/windows-release.yml
@@ -20,7 +20,7 @@ jobs:
       # Indicates the location of the vcpkg as a Git submodule of the project repository.
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
-      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.2-rte2.1/ortools_cxx_windows-latest_static_sirius.zip"
+      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip"
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
index 189c4c1542..f6e291cc04 100644
--- a/.github/workflows/windows-vcpkg.yml
+++ b/.github/workflows/windows-vcpkg.yml
@@ -28,7 +28,7 @@ jobs:
       # Indicates the location of the vcpkg as a Git submodule of the project repository.
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
-      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.2-rte2.1/ortools_cxx_windows-latest_static_sirius.zip"
+      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip"
 
     steps:
     - uses: actions/checkout@v3
diff --git a/ortools_tag b/ortools_tag
index c0d9150601..898fb20318 100644
--- a/ortools_tag
+++ b/ortools_tag
@@ -1 +1 @@
-v9.2-rte2.1
\ No newline at end of file
+v9.5-rte2.0
\ No newline at end of file
diff --git a/src/ui/simulator/windows/simulation/run.cpp b/src/ui/simulator/windows/simulation/run.cpp
index d767d55d40..27e35f3540 100644
--- a/src/ui/simulator/windows/simulation/run.cpp
+++ b/src/ui/simulator/windows/simulation/run.cpp
@@ -91,7 +91,11 @@ static wxString TimeSeriesToWxString(uint m)
         r << (r.empty() ? wxEmptyString : wxT(", ")) << wxT("wind");
     if (m & Data::timeSeriesThermal)
         r << (r.empty() ? wxEmptyString : wxT(", ")) << wxT("thermal");
-    return r.empty() ? wxT("none") : r;
+
+    if (r.empty())
+        return wxT("none");
+    else
+        return r;
 }
 
 static inline void UpdateLabel(bool& guiUpdated, wxStaticText* label, const wxString& text)