diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index d1997ec3d3..e255779fac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -83,6 +83,11 @@ public class MedtronicHistoryData {
 
     private long lastIdUsed = 0;
 
+    /**
+     * Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses
+     * from history. This flag turns on debugging for that (default is off=false)... Debuging is pretty detailed,
+     * so log files will get bigger.
+     */
     public static boolean doubleBolusDebug = true;
 
 
@@ -1290,8 +1295,6 @@ public class MedtronicHistoryData {
             }
         }
 
-        //LocalDateTime oldestEntryTime = null;
-
         if (doubleBolusDebug)
             LOG.debug("DoubleBolusDebug: getOldestTimestamp. Oldest entry found: time={}, object={}", dt, currentTreatment);
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0ad824ddea..acaa1019de 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -99,7 +99,7 @@
         <item>@string/use_gps_location</item>
     </string-array>
 
-   <string-array name="locationValues" translatable="false">
+    <string-array name="locationValues" translatable="false">
         <item>PASSIVE</item>
         <item>NETWORK</item>
         <item>GPS</item>
@@ -151,7 +151,7 @@
         <item>@string/medtronic_pump_frequency_worldwide</item>
     </string-array>
 
-   <string-array name="medtronicPumpFreqValues">
+    <string-array name="medtronicPumpFreqValues">
         <item>@string/key_medtronic_pump_frequency_us_ca</item>
         <item>@string/key_medtronic_pump_frequency_worldwide</item>
     </string-array>
@@ -167,6 +167,11 @@
         <item>@string/medtronic_pump_encoding_4b6b_rileylink</item>
     </string-array>
 
+    <string-array name="onOff">
+        <item>@string/common_on</item>
+        <item>@string/common_off</item>
+    </string-array>
+
     <string-array name="medtronicEncodingValues">
         <item>@string/key_medtronic_pump_encoding_4b6b_local</item>
         <item>@string/key_medtronic_pump_encoding_4b6b_rileylink</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 520b560c9d..3a4e43e6e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,15 +4,15 @@
     <string name="af_lang" translatable="false">Afrikaans</string>
     <string name="bg_lang" translatable="false">Bulgarian</string>
     <string name="nl_lang" translatable="false">Dutch</string>
-<!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <string name="fr_lang" translatable="false">French</string>
     <string name="de_lang" translatable="false">German</string>
     <string name="el_lang" translatable="false">Greek</string>
-<!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <string name="zh_lang" translatable="false">Chinese</string>
-<!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <string name="it_lang" translatable="false">Italian</string>
-<!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
     <string name="ko_lang" translatable="false">Korean</string>
     <string name="lt_lang" translatable="false">Lithuanian</string>
     <string name="pl_lang" translatable="false">Polish</string>
@@ -1451,6 +1451,7 @@
     <string name="medtronic_pump_battery_no">Not selected (Simple view)</string>
     <string name="medtronic_pump_battery_alkaline">Alkaline (Extended view)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (Extended view)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Treatments Debugging</string>
 
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SCAN</string>
@@ -1608,5 +1609,7 @@
     <string name="unit_minute_short">min</string>
     <string name="key_wizard_calculation_visible" translatable="false">wizard_calculation_visible</string>
     <string name="format_carbs">%1$dg</string>
+    <string name="common_on">On</string>
+    <string name="common_off">Off</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_medtronic.xml b/app/src/main/res/xml/pref_medtronic.xml
index 603d3873f8..a38cc22923 100644
--- a/app/src/main/res/xml/pref_medtronic.xml
+++ b/app/src/main/res/xml/pref_medtronic.xml
@@ -60,6 +60,14 @@
             android:selectable="true"
             android:title="@string/medtronic_pump_encoding" />
 
+        <ListPreference
+            android:defaultValue="@string/key_medtronic_pump_encoding_4b6b_rileylinkddddd"
+            android:entries="@array/medtronicEncoding"
+            android:entryValues="@array/medtronicEncodingValues"
+            android:key="@string/key_medtronic_encoding"
+            android:selectable="true"
+            android:title="@string/medtronic_bolus_debugging" />
+
         <ListPreference
             android:defaultValue="@string/key_medtronic_pump_battery_no"
             android:entries="@array/medtronicBatteryType"