diff --git a/ChangeLog.md b/ChangeLog.md
index 156bbfb096b667c95cf065b75b77373cfe052e52..b384966f4ff129cad7c7b2c1842d83747b48fb07 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,11 +8,14 @@ Note: This file only contains high level features or important fixes.
 
 * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
 
-### 3.5.1 - Not yet released
+### 3.5.2 - Not yet released
+* ArduPilot: Fix parameter file save generating bad characters from git hash
+
+### 3.5.1
 * Fix visibility of PX4/ArduPilot logo in toolbar
 * Fix tile set count but in OfflineMaps which would cause image and elevation tile set to have incorrect counts and be incorrectly marked as download incomplete.
 
-### 3.5.0 - Stable
+### 3.5.0
 * Plan GeoFence: Fix loading of fence from intermediate 3.4 code
 * Structure Scan: Fix loading of structure scan height
 * ArduPilot: Fix location of planned home position when not connected to vehicle. Issue #6840.
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index f5cba24895b7e675fe3be169cc6e01a6474e2940..9123b678e2811063f3e12240a91b9692d91f6b35 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1309,13 +1309,15 @@ void Vehicle::_handleAutopilotVersion(LinkInterface *link, mavlink_message_t& me
 
         // PX4 Firmware stores the first 16 characters of the git hash as binary, with the individual bytes in reverse order
         _gitHash = "";
-        QByteArray array((char*)autopilotVersion.flight_custom_version, 8);
         for (int i = 7; i >= 0; i--) {
             _gitHash.append(QString("%1").arg(autopilotVersion.flight_custom_version[i], 2, 16, QChar('0')));
         }
     } else {
         // APM Firmware stores the first 8 characters of the git hash as an ASCII character string
-        _gitHash = QString::fromUtf8((char*)autopilotVersion.flight_custom_version, 8);
+        char nullStr[9];
+        strncpy(nullStr, (char*)autopilotVersion.flight_custom_version, 8);
+        nullStr[8] = 0;
+        _gitHash = nullStr;
     }
     if (_toolbox->corePlugin()->options()->checkFirmwareVersion()) {
         _firmwarePlugin->checkIfIsLatestStable(this);