diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
index 62bc9cdf6..0d65a00d5 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
@@ -145,7 +145,7 @@
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>22</version>
+        <version>23</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -278,6 +278,10 @@
           <name>CCVCCDefault</name>
           <state>1</state>
         </option>
+        <option>
+          <name>Retain</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -318,6 +322,14 @@
         <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -330,6 +342,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -342,22 +358,10 @@
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -507,7 +511,7 @@
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>22</version>
+        <version>23</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -640,6 +644,10 @@
           <name>CCVCCDefault</name>
           <state>1</state>
         </option>
+        <option>
+          <name>Retain</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -680,6 +688,14 @@
         <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -692,6 +708,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -704,22 +724,10 @@
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -869,7 +877,7 @@
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>22</version>
+        <version>23</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1002,6 +1010,10 @@
           <name>CCVCCDefault</name>
           <state>1</state>
         </option>
+        <option>
+          <name>Retain</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1042,6 +1054,14 @@
         <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -1054,6 +1074,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -1066,22 +1090,10 @@
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -1231,7 +1243,7 @@
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>22</version>
+        <version>23</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1364,6 +1376,10 @@
           <name>CCVCCDefault</name>
           <state>1</state>
         </option>
+        <option>
+          <name>Retain</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1404,6 +1420,14 @@
         <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -1416,6 +1440,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
@@ -1428,22 +1456,10 @@
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index 5cba6580e..76af4b41f 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -10,9 +10,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>7</archiveVersion>
+      <archiveVersion>9</archiveVersion>
       <data>
-        <version>27</version>
+        <version>28</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -27,10 +27,6 @@
           <name>ListPath</name>
           <state>Debug_Large_Data_Model\List</state>
         </option>
-        <option>
-          <name>PosIndCode</name>
-          <state>0</state>
-        </option>
         <option>
           <name>Hardware Multiplier</name>
           <state>1</state>
@@ -66,8 +62,8 @@
         </option>
         <option>
           <name>Input variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Input description</name>
@@ -75,8 +71,8 @@
         </option>
         <option>
           <name>Output variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Output description</name>
@@ -149,13 +145,21 @@
           <name>RadioL092ModelType</name>
           <state>0</state>
         </option>
+        <option>
+          <name>Ropi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NoRwDynamicInit</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>30</version>
+        <version>33</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -287,10 +291,6 @@
           <name>OCCR5Utilize</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CPIC</name>
-          <state>1</state>
-        </option>
         <option>
           <name>IExtraOptionsCheck</name>
           <state>0</state>
@@ -393,11 +393,67 @@
           <state>1</state>
         </option>
         <option>
-          <name>IccRelaxedFpPrecision</name>
+          <name>CCPUTAG</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCodeFunctions</name>
+          <state>CODE</state>
+        </option>
+        <option>
+          <name>CCData16</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCData20</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCIntvec</name>
+          <state>INTVEC</state>
+        </option>
+        <option>
+          <name>CCCstack</name>
+          <state>CSTACK</state>
+        </option>
+        <option>
+          <name>CCRamFuncCode</name>
+          <state>RAMFUNC_CODE</state>
+        </option>
+        <option>
+          <name>CCIsrCode</name>
+          <state>ISR_CODE</state>
+        </option>
+        <option>
+          <name>CCDifunct</name>
+          <state>DIFUNCT</state>
+        </option>
+        <option>
+          <name>AggressiveInlining</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AggressiveUnrolling</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
           <state>0</state>
         </option>
         <option>
-          <name>CCPUTAG</name>
+          <name>CROPI</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CNoRwDynamicInit</name>
           <state>1</state>
         </option>
       </data>
@@ -902,9 +958,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>7</archiveVersion>
+      <archiveVersion>9</archiveVersion>
       <data>
-        <version>27</version>
+        <version>28</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -919,10 +975,6 @@
           <name>ListPath</name>
           <state>Release_Large_Data_Model\List</state>
         </option>
-        <option>
-          <name>PosIndCode</name>
-          <state>0</state>
-        </option>
         <option>
           <name>Hardware Multiplier</name>
           <state>1</state>
@@ -958,8 +1010,8 @@
         </option>
         <option>
           <name>Input variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Input description</name>
@@ -967,8 +1019,8 @@
         </option>
         <option>
           <name>Output variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Output description</name>
@@ -1041,13 +1093,21 @@
           <name>RadioL092ModelType</name>
           <state>0</state>
         </option>
+        <option>
+          <name>Ropi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NoRwDynamicInit</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>30</version>
+        <version>33</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1179,10 +1239,6 @@
           <name>OCCR5Utilize</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CPIC</name>
-          <state>1</state>
-        </option>
         <option>
           <name>IExtraOptionsCheck</name>
           <state>0</state>
@@ -1285,11 +1341,67 @@
           <state>1</state>
         </option>
         <option>
-          <name>IccRelaxedFpPrecision</name>
+          <name>CCPUTAG</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCodeFunctions</name>
+          <state>CODE</state>
+        </option>
+        <option>
+          <name>CCData16</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCData20</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCIntvec</name>
+          <state>INTVEC</state>
+        </option>
+        <option>
+          <name>CCCstack</name>
+          <state>CSTACK</state>
+        </option>
+        <option>
+          <name>CCRamFuncCode</name>
+          <state>RAMFUNC_CODE</state>
+        </option>
+        <option>
+          <name>CCIsrCode</name>
+          <state>ISR_CODE</state>
+        </option>
+        <option>
+          <name>CCDifunct</name>
+          <state>DIFUNCT</state>
+        </option>
+        <option>
+          <name>AggressiveInlining</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AggressiveUnrolling</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
           <state>0</state>
         </option>
         <option>
-          <name>CCPUTAG</name>
+          <name>CROPI</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CNoRwDynamicInit</name>
           <state>1</state>
         </option>
       </data>
@@ -1794,9 +1906,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>7</archiveVersion>
+      <archiveVersion>9</archiveVersion>
       <data>
-        <version>27</version>
+        <version>28</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1811,10 +1923,6 @@
           <name>ListPath</name>
           <state>Debug_Small_Data_Model\List</state>
         </option>
-        <option>
-          <name>PosIndCode</name>
-          <state>0</state>
-        </option>
         <option>
           <name>Hardware Multiplier</name>
           <state>1</state>
@@ -1850,8 +1958,8 @@
         </option>
         <option>
           <name>Input variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Input description</name>
@@ -1859,8 +1967,8 @@
         </option>
         <option>
           <name>Output variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Output description</name>
@@ -1933,13 +2041,21 @@
           <name>RadioL092ModelType</name>
           <state>0</state>
         </option>
+        <option>
+          <name>Ropi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NoRwDynamicInit</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>30</version>
+        <version>33</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2071,10 +2187,6 @@
           <name>OCCR5Utilize</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CPIC</name>
-          <state>1</state>
-        </option>
         <option>
           <name>IExtraOptionsCheck</name>
           <state>0</state>
@@ -2177,11 +2289,67 @@
           <state>1</state>
         </option>
         <option>
-          <name>IccRelaxedFpPrecision</name>
+          <name>CCPUTAG</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCodeFunctions</name>
+          <state>CODE</state>
+        </option>
+        <option>
+          <name>CCData16</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCData20</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCIntvec</name>
+          <state>INTVEC</state>
+        </option>
+        <option>
+          <name>CCCstack</name>
+          <state>CSTACK</state>
+        </option>
+        <option>
+          <name>CCRamFuncCode</name>
+          <state>RAMFUNC_CODE</state>
+        </option>
+        <option>
+          <name>CCIsrCode</name>
+          <state>ISR_CODE</state>
+        </option>
+        <option>
+          <name>CCDifunct</name>
+          <state>DIFUNCT</state>
+        </option>
+        <option>
+          <name>AggressiveInlining</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AggressiveUnrolling</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
           <state>0</state>
         </option>
         <option>
-          <name>CCPUTAG</name>
+          <name>CROPI</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CNoRwDynamicInit</name>
           <state>1</state>
         </option>
       </data>
@@ -2686,9 +2854,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>7</archiveVersion>
+      <archiveVersion>9</archiveVersion>
       <data>
-        <version>27</version>
+        <version>28</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2703,10 +2871,6 @@
           <name>ListPath</name>
           <state>Debug_Medium_Data_Model\List</state>
         </option>
-        <option>
-          <name>PosIndCode</name>
-          <state>0</state>
-        </option>
         <option>
           <name>Hardware Multiplier</name>
           <state>1</state>
@@ -2742,8 +2906,8 @@
         </option>
         <option>
           <name>Input variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Input description</name>
@@ -2751,8 +2915,8 @@
         </option>
         <option>
           <name>Output variant</name>
-          <version>0</version>
-          <state>3</state>
+          <version>1</version>
+          <state>4</state>
         </option>
         <option>
           <name>Output description</name>
@@ -2825,13 +2989,21 @@
           <name>RadioL092ModelType</name>
           <state>0</state>
         </option>
+        <option>
+          <name>Ropi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NoRwDynamicInit</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>30</version>
+        <version>33</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2963,10 +3135,6 @@
           <name>OCCR5Utilize</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CPIC</name>
-          <state>1</state>
-        </option>
         <option>
           <name>IExtraOptionsCheck</name>
           <state>0</state>
@@ -3069,11 +3237,67 @@
           <state>1</state>
         </option>
         <option>
-          <name>IccRelaxedFpPrecision</name>
+          <name>CCPUTAG</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCodeFunctions</name>
+          <state>CODE</state>
+        </option>
+        <option>
+          <name>CCData16</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCData20</name>
+          <state>DATA</state>
+        </option>
+        <option>
+          <name>CCIntvec</name>
+          <state>INTVEC</state>
+        </option>
+        <option>
+          <name>CCCstack</name>
+          <state>CSTACK</state>
+        </option>
+        <option>
+          <name>CCRamFuncCode</name>
+          <state>RAMFUNC_CODE</state>
+        </option>
+        <option>
+          <name>CCIsrCode</name>
+          <state>ISR_CODE</state>
+        </option>
+        <option>
+          <name>CCDifunct</name>
+          <state>DIFUNCT</state>
+        </option>
+        <option>
+          <name>AggressiveInlining</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AggressiveUnrolling</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
           <state>0</state>
         </option>
         <option>
-          <name>CCPUTAG</name>
+          <name>CROPI</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CNoRwDynamicInit</name>
           <state>1</state>
         </option>
       </data>