diff --git a/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewd b/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewd
index d8cbd95be6..6d2fd6390a 100644
--- a/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewd
+++ b/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\.iar\config\debugger\ARMCM3.ddf</state>
+                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\.iar\config\debugger\ARMCM3.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -498,7 +498,7 @@
             <name>IJET_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -722,6 +722,58 @@
                     <name>CCIjetUsbSerialNoSelect</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CatchV8ARReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL3S</name>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -928,7 +980,7 @@
             <name>LMIFTDI_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>2</version>
+                <version>3</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -955,6 +1007,19 @@
                     <name>CCLmiFtdiInterfaceCmdLine</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1227,7 +1292,7 @@
             <name>XDS100_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -1401,6 +1466,10 @@
                     <name>OCXDSDigitalStatesConfigFile</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>OCSelectedCoreName</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <debuggerPlugins>
@@ -1420,10 +1489,6 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\HWRTOSplugin\HWRTOSplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -1436,30 +1501,22 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.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\SMX\smxAwareIarArm8b.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8bBE.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -1983,7 +2040,7 @@
             <name>IJET_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2207,6 +2264,58 @@
                     <name>CCIjetUsbSerialNoSelect</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CatchV8ARReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL3S</name>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2413,7 +2522,7 @@
             <name>LMIFTDI_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>2</version>
+                <version>3</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2440,6 +2549,19 @@
                     <name>CCLmiFtdiInterfaceCmdLine</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2712,7 +2834,7 @@
             <name>XDS100_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2886,6 +3008,10 @@
                     <name>OCXDSDigitalStatesConfigFile</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>OCSelectedCoreName</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <debuggerPlugins>
@@ -2905,10 +3031,6 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\HWRTOSplugin\HWRTOSplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -2921,30 +3043,22 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.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\SMX\smxAwareIarArm8b.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8bBE.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
                 <loadFlag>0</loadFlag>
diff --git a/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewp b/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewp
index cbd0ebc57b..af3212ce4f 100644
--- a/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewp
+++ b/CMSIS/RTOS2/RTX/Examples_IAR/Blinky/Blinky/Blinky.ewp
@@ -11,9 +11,13 @@
             <name>General</name>
             <archiveVersion>3</archiveVersion>
             <data>
-                <version>31</version>
+                <version>35</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>BrowseInfoPath</name>
+                    <state>Debug\BrowseInfo</state>
+                </option>
                 <option>
                     <name>ExePath</name>
                     <state>Debug\Exe</state>
@@ -66,15 +70,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.50.1.24770</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
+                    <state>9.30.1.50052</state>
                 </option>
                 <option>
                     <name>OGChipSelectEditMenu</name>
@@ -96,27 +92,13 @@
                     <name>GenStdoutInterface</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>RTConfigPath2</name>
                     <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
                 </option>
                 <option>
                     <name>GBECoreSlave</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -133,7 +115,7 @@
                 </option>
                 <option>
                     <name>CoreVariant</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -156,7 +138,7 @@
                 </option>
                 <option>
                     <name>GFPUCoreSlave2</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -209,13 +191,33 @@
                     <version>0</version>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>OGAarch64Abi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OG_32_64Device</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>BuildFilesPath</name>
+                    <state>Debug</state>
+                </option>
+                <option>
+                    <name>PointerAuthentication</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FPU64</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
             <name>ICCARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>36</version>
+                <version>37</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -340,10 +342,6 @@
                     <name>PreInclude</name>
                     <state></state>
                 </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$CMSIS_PACK_DEVICE_INCLUDES$</state>
@@ -374,16 +372,6 @@
                     <name>CCOptLevelSlave</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>CCPosIndRopi</name>
                     <state>0</state>
@@ -479,7 +467,7 @@
             <name>AARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>10</version>
+                <version>11</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -637,6 +625,10 @@
                     <name>AsmNoLiteralPool</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -676,13 +668,9 @@
                 <extensions></extensions>
                 <cmdline></cmdline>
                 <hasPrio>0</hasPrio>
+                <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
         <settings>
             <name>BUILDACTION</name>
             <archiveVersion>1</archiveVersion>
@@ -695,17 +683,13 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>23</version>
+                <version>27</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
                     <name>IlinkLibIOConfig</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>IlinkInputFileSlave</name>
                     <state>0</state>
@@ -776,7 +760,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\.iar\config\linker\ARMCM3.icf</state>
+                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\.iar\config\linker\ARMCM3.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1031,6 +1015,42 @@
                     <name>IlinkRawBinaryAlign2</name>
                     <state></state>
                 </option>
+                <option>
+                    <name>IlinkLogCrtRoutineSelection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogFragmentInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInlining</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogMerging</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkDemangle</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFileEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkFpuProcessor</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1054,11 +1074,6 @@
                 </option>
             </data>
         </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
     </configuration>
     <configuration>
         <name>Release</name>
@@ -1070,9 +1085,13 @@
             <name>General</name>
             <archiveVersion>3</archiveVersion>
             <data>
-                <version>31</version>
+                <version>35</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
+                <option>
+                    <name>BrowseInfoPath</name>
+                    <state>Release\BrowseInfo</state>
+                </option>
                 <option>
                     <name>ExePath</name>
                     <state>Release\Exe</state>
@@ -1127,14 +1146,6 @@
                     <name>OGLastSavedByProductVersion</name>
                     <state>8.50.1.24770</state>
                 </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>OGChipSelectEditMenu</name>
                     <state></state>
@@ -1155,27 +1166,13 @@
                     <name>GenStdoutInterface</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>RTConfigPath2</name>
                     <state></state>
                 </option>
                 <option>
                     <name>GBECoreSlave</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1192,7 +1189,7 @@
                 </option>
                 <option>
                     <name>CoreVariant</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1215,7 +1212,7 @@
                 </option>
                 <option>
                     <name>GFPUCoreSlave2</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1268,13 +1265,33 @@
                     <version>0</version>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>OGAarch64Abi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OG_32_64Device</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>BuildFilesPath</name>
+                    <state>Release</state>
+                </option>
+                <option>
+                    <name>PointerAuthentication</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FPU64</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
             <name>ICCARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>36</version>
+                <version>37</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -1400,10 +1417,6 @@
                     <name>PreInclude</name>
                     <state></state>
                 </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$CMSIS_PACK_DEVICE_INCLUDES$</state>
@@ -1434,16 +1447,6 @@
                     <name>CCOptLevelSlave</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>CCPosIndRopi</name>
                     <state>0</state>
@@ -1539,7 +1542,7 @@
             <name>AARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>10</version>
+                <version>11</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -1697,6 +1700,10 @@
                     <name>AsmNoLiteralPool</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1736,13 +1743,9 @@
                 <extensions></extensions>
                 <cmdline></cmdline>
                 <hasPrio>0</hasPrio>
+                <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
         <settings>
             <name>BUILDACTION</name>
             <archiveVersion>1</archiveVersion>
@@ -1755,17 +1758,13 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>23</version>
+                <version>27</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
                     <name>IlinkLibIOConfig</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>IlinkInputFileSlave</name>
                     <state>0</state>
@@ -2091,6 +2090,42 @@
                     <name>IlinkRawBinaryAlign2</name>
                     <state></state>
                 </option>
+                <option>
+                    <name>IlinkLogCrtRoutineSelection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogFragmentInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInlining</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogMerging</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkDemangle</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFileEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkFpuProcessor</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2114,11 +2149,6 @@
                 </option>
             </data>
         </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
     </configuration>
     <file>
         <name>$PROJ_DIR$\..\Blinky.c</name>
@@ -2126,14 +2156,17 @@
     <group>
         <name>CMSIS-Pack</name>
         <tag>CMSISPack.Component</tag>
+        <file>
+            <name>$PROJ_DIR$\RTE\RTE_Components.h</name>
+        </file>
         <group>
             <name>CMSIS.RTOS2.Keil RTX5 Source</name>
             <tag>CMSISPack.Component</tag>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/IAR/irq_armv7m.s</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/Source/os_systick.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/Source/os_systick.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\RTE\CMSIS\RTX_Config.c</name>
@@ -2142,43 +2175,43 @@
                 <name>$PROJ_DIR$\RTE\CMSIS\RTX_Config.h</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_delay.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_delay.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_evflags.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_evflags.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_evr.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_evr.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_kernel.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_kernel.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_lib.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_lib.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_memory.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_memory.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_mempool.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_mempool.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_msgqueue.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_msgqueue.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_mutex.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_mutex.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_semaphore.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_semaphore.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_system.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_system.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_thread.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_thread.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_timer.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_timer.c</name>
             </file>
         </group>
         <group>
@@ -2191,33 +2224,30 @@
                 <name>$PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c</name>
             </file>
         </group>
-        <file>
-            <name>$PROJ_DIR$\RTE\RTE_Components.h</name>
-        </file>
     </group>
     <cmsisPackSettings>
         <rte>&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;

 &lt;configuration xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"&gt;

   &lt;packages/&gt;

   &lt;device Dclock="10000000" Dcore="Cortex-M3" DcoreVersion="r2p1" Dendian="Little-endian" Dfamily="ARM Cortex M3" Dfpu="NO_FPU" Dmpu="MPU" Dname="ARMCM3" Dvendor="ARM:82" info="ARM , 128 KB RAM, 256 KB ROM" url="http://www.keil.com/dd2/arm/armcm3"&gt;

-    &lt;package info="CMSIS (Cortex Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;package info="CMSIS (Common Microcontroller Software Interface Standard)" name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

   &lt;/device&gt;

   &lt;toolchain Tcompiler="IAR" Toutput="exe"/&gt;

   &lt;components&gt;

-    &lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.7.0"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/Core/html/index.html"/&gt;

       &lt;file category="include" name="CMSIS/Core/Include/"/&gt;

       &lt;file category="header" condition="TrustZone" name="CMSIS/Core/Include/tz_context.h"/&gt;

       &lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/main_s.c" select="Secure mode 'main' module for ARMv8-M" version="1.1.1"/&gt;

       &lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/tz_context.c" select="RTOS Context Management (TrustZone for ARMv8-M)" version="1.1.1"/&gt;

     &lt;/component&gt;

-    &lt;component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.5.2"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/&gt;

       &lt;file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/&gt;

-      &lt;file attr="config" category="header" name="CMSIS/RTOS2/RTX/Config/RTX_Config.h" version="5.5.1"/&gt;

-      &lt;file attr="config" category="source" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.1.0"/&gt;

+      &lt;file attr="config" category="header" name="CMSIS/RTOS2/RTX/Config/RTX_Config.h" version="5.6.0"/&gt;

+      &lt;file attr="config" category="source" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.2.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/main.c" select="CMSIS-RTOS2 'main' function" version="2.1.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/Events.c" select="CMSIS-RTOS2 Events" version="2.0.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/MemPool.c" select="CMSIS-RTOS2 Memory Pool" version="2.0.0"/&gt;

@@ -2241,19 +2271,19 @@
       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_system.c"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_evr.c"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_lib.c"/&gt;

-      &lt;file category="source" condition="CM3_IAR" name="CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s"/&gt;

+      &lt;file category="source" condition="IARASM ARMv7-M" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv7m.s"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/Source/os_systick.c"/&gt;

     &lt;/component&gt;

     &lt;component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" deviceDependent="1"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="header" deviceDependent="1" name="Device/ARM/ARMCM3/Include/ARMCM3.h"/&gt;

       &lt;file attr="config" category="sourceAsm" condition="IAR" deviceDependent="1" name="Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s" version="1.0.0"/&gt;

       &lt;file attr="config" category="sourceC" deviceDependent="1" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/&gt;

     &lt;/component&gt;

   &lt;/components&gt;

   &lt;apis&gt;

-    &lt;api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.1.3" exclusive="1"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;api Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.2.0" exclusive="1"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/&gt;

       &lt;file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/&gt;

     &lt;/api&gt;

diff --git a/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewd b/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewd
index d8cbd95be6..6d2fd6390a 100644
--- a/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewd
+++ b/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\.iar\config\debugger\ARMCM3.ddf</state>
+                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\.iar\config\debugger\ARMCM3.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -498,7 +498,7 @@
             <name>IJET_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -722,6 +722,58 @@
                     <name>CCIjetUsbSerialNoSelect</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CatchV8ARReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL3S</name>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -928,7 +980,7 @@
             <name>LMIFTDI_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>2</version>
+                <version>3</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -955,6 +1007,19 @@
                     <name>CCLmiFtdiInterfaceCmdLine</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1227,7 +1292,7 @@
             <name>XDS100_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -1401,6 +1466,10 @@
                     <name>OCXDSDigitalStatesConfigFile</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>OCSelectedCoreName</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <debuggerPlugins>
@@ -1420,10 +1489,6 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\HWRTOSplugin\HWRTOSplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -1436,30 +1501,22 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.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\SMX\smxAwareIarArm8b.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8bBE.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -1983,7 +2040,7 @@
             <name>IJET_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2207,6 +2264,58 @@
                     <name>CCIjetUsbSerialNoSelect</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CatchV8ARReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREREL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL1S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL2NS</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8AREEL3S</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchV8ARREL3S</name>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2413,7 +2522,7 @@
             <name>LMIFTDI_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>2</version>
+                <version>3</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2440,6 +2549,19 @@
                     <name>CCLmiFtdiInterfaceCmdLine</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLmiftdiUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2712,7 +2834,7 @@
             <name>XDS100_ID</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>8</version>
+                <version>9</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2886,6 +3008,10 @@
                     <name>OCXDSDigitalStatesConfigFile</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>OCSelectedCoreName</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <debuggerPlugins>
@@ -2905,10 +3031,6 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\HWRTOSplugin\HWRTOSplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
@@ -2921,30 +3043,22 @@
                 <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\RemedyRtosViewer\RemedyRtosViewer.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\SMX\smxAwareIarArm8b.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8bBE.ewplugin</file>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
                 <loadFlag>0</loadFlag>
             </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
             <plugin>
                 <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
                 <loadFlag>0</loadFlag>
diff --git a/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewp b/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewp
index ebc4e58c2d..7f3c9688e8 100644
--- a/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewp
+++ b/CMSIS/RTOS2/RTX/Examples_IAR/MsgQueue/MsgQueue/MsgQueue.ewp
@@ -11,9 +11,13 @@
             <name>General</name>
             <archiveVersion>3</archiveVersion>
             <data>
-                <version>31</version>
+                <version>35</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>BrowseInfoPath</name>
+                    <state>Debug\BrowseInfo</state>
+                </option>
                 <option>
                     <name>ExePath</name>
                     <state>Debug\Exe</state>
@@ -66,15 +70,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.50.1.24770</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
+                    <state>9.30.1.50052</state>
                 </option>
                 <option>
                     <name>OGChipSelectEditMenu</name>
@@ -96,27 +92,13 @@
                     <name>GenStdoutInterface</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>RTConfigPath2</name>
                     <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
                 </option>
                 <option>
                     <name>GBECoreSlave</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -133,7 +115,7 @@
                 </option>
                 <option>
                     <name>CoreVariant</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -156,7 +138,7 @@
                 </option>
                 <option>
                     <name>GFPUCoreSlave2</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -209,13 +191,33 @@
                     <version>0</version>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>OGAarch64Abi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OG_32_64Device</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>BuildFilesPath</name>
+                    <state>Debug</state>
+                </option>
+                <option>
+                    <name>PointerAuthentication</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FPU64</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
             <name>ICCARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>36</version>
+                <version>37</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -340,10 +342,6 @@
                     <name>PreInclude</name>
                     <state></state>
                 </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$CMSIS_PACK_DEVICE_INCLUDES$</state>
@@ -374,16 +372,6 @@
                     <name>CCOptLevelSlave</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>CCPosIndRopi</name>
                     <state>0</state>
@@ -479,7 +467,7 @@
             <name>AARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>10</version>
+                <version>11</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
@@ -637,6 +625,10 @@
                     <name>AsmNoLiteralPool</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -676,13 +668,9 @@
                 <extensions></extensions>
                 <cmdline></cmdline>
                 <hasPrio>0</hasPrio>
+                <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
         <settings>
             <name>BUILDACTION</name>
             <archiveVersion>1</archiveVersion>
@@ -695,17 +683,13 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>23</version>
+                <version>27</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
                 <option>
                     <name>IlinkLibIOConfig</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>IlinkInputFileSlave</name>
                     <state>0</state>
@@ -776,7 +760,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\.iar\config\linker\ARMCM3.icf</state>
+                    <state>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\.iar\config\linker\ARMCM3.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1031,6 +1015,42 @@
                     <name>IlinkRawBinaryAlign2</name>
                     <state></state>
                 </option>
+                <option>
+                    <name>IlinkLogCrtRoutineSelection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogFragmentInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInlining</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogMerging</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkDemangle</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFileEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkFpuProcessor</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1054,11 +1074,6 @@
                 </option>
             </data>
         </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
     </configuration>
     <configuration>
         <name>Release</name>
@@ -1070,9 +1085,13 @@
             <name>General</name>
             <archiveVersion>3</archiveVersion>
             <data>
-                <version>31</version>
+                <version>35</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
+                <option>
+                    <name>BrowseInfoPath</name>
+                    <state>Release\BrowseInfo</state>
+                </option>
                 <option>
                     <name>ExePath</name>
                     <state>Release\Exe</state>
@@ -1127,14 +1146,6 @@
                     <name>OGLastSavedByProductVersion</name>
                     <state>8.50.1.24770</state>
                 </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>OGChipSelectEditMenu</name>
                     <state></state>
@@ -1155,27 +1166,13 @@
                     <name>GenStdoutInterface</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>RTConfigPath2</name>
                     <state></state>
                 </option>
                 <option>
                     <name>GBECoreSlave</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1192,7 +1189,7 @@
                 </option>
                 <option>
                     <name>CoreVariant</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1215,7 +1212,7 @@
                 </option>
                 <option>
                     <name>GFPUCoreSlave2</name>
-                    <version>28</version>
+                    <version>32</version>
                     <state>38</state>
                 </option>
                 <option>
@@ -1268,13 +1265,33 @@
                     <version>0</version>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>OGAarch64Abi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OG_32_64Device</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>BuildFilesPath</name>
+                    <state>Release</state>
+                </option>
+                <option>
+                    <name>PointerAuthentication</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FPU64</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
             <name>ICCARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>36</version>
+                <version>37</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -1400,10 +1417,6 @@
                     <name>PreInclude</name>
                     <state></state>
                 </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$CMSIS_PACK_DEVICE_INCLUDES$</state>
@@ -1434,16 +1447,6 @@
                     <name>CCOptLevelSlave</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
                 <option>
                     <name>CCPosIndRopi</name>
                     <state>0</state>
@@ -1539,7 +1542,7 @@
             <name>AARM</name>
             <archiveVersion>2</archiveVersion>
             <data>
-                <version>10</version>
+                <version>11</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -1697,6 +1700,10 @@
                     <name>AsmNoLiteralPool</name>
                     <state>0</state>
                 </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1736,13 +1743,9 @@
                 <extensions></extensions>
                 <cmdline></cmdline>
                 <hasPrio>0</hasPrio>
+                <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
         <settings>
             <name>BUILDACTION</name>
             <archiveVersion>1</archiveVersion>
@@ -1755,17 +1758,13 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>23</version>
+                <version>27</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
                     <name>IlinkLibIOConfig</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>IlinkInputFileSlave</name>
                     <state>0</state>
@@ -2091,6 +2090,42 @@
                     <name>IlinkRawBinaryAlign2</name>
                     <state></state>
                 </option>
+                <option>
+                    <name>IlinkLogCrtRoutineSelection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogFragmentInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInlining</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogMerging</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkDemangle</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFileEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkWrapperFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkFpuProcessor</name>
+                    <state>1</state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2114,11 +2149,6 @@
                 </option>
             </data>
         </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
     </configuration>
     <file>
         <name>$PROJ_DIR$\..\main.c</name>
@@ -2126,14 +2156,17 @@
     <group>
         <name>CMSIS-Pack</name>
         <tag>CMSISPack.Component</tag>
+        <file>
+            <name>$PROJ_DIR$\RTE\RTE_Components.h</name>
+        </file>
         <group>
             <name>CMSIS.RTOS2.Keil RTX5 Source</name>
             <tag>CMSISPack.Component</tag>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/IAR/irq_armv7m.s</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/Source/os_systick.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/Source/os_systick.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\RTE\CMSIS\RTX_Config.c</name>
@@ -2142,43 +2175,43 @@
                 <name>$PROJ_DIR$\RTE\CMSIS\RTX_Config.h</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_delay.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_delay.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_evflags.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_evflags.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_evr.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_evr.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_kernel.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_kernel.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_lib.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_lib.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_memory.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_memory.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_mempool.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_mempool.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_msgqueue.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_msgqueue.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_mutex.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_mutex.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_semaphore.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_semaphore.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_system.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_system.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_thread.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_thread.c</name>
             </file>
             <file>
-                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.7.0-dev5}$\CMSIS/RTOS2/RTX/Source/rtx_timer.c</name>
+                <name>${CMSIS_PACK_PATH_ARM#CMSIS#5.9.1}$\CMSIS/RTOS2/RTX/Source/rtx_timer.c</name>
             </file>
         </group>
         <group>
@@ -2191,33 +2224,30 @@
                 <name>$PROJ_DIR$\RTE\Device\ARMCM3\system_ARMCM3.c</name>
             </file>
         </group>
-        <file>
-            <name>$PROJ_DIR$\RTE\RTE_Components.h</name>
-        </file>
     </group>
     <cmsisPackSettings>
         <rte>&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;

 &lt;configuration xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"&gt;

   &lt;packages/&gt;

   &lt;device Dclock="10000000" Dcore="Cortex-M3" DcoreVersion="r2p1" Dendian="Little-endian" Dfamily="ARM Cortex M3" Dfpu="NO_FPU" Dmpu="MPU" Dname="ARMCM3" Dvendor="ARM:82" info="ARM , 128 KB RAM, 256 KB ROM" url="http://www.keil.com/dd2/arm/armcm3"&gt;

-    &lt;package info="CMSIS (Cortex Microcontroller Software Interface Standard)" name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;package info="CMSIS (Common Microcontroller Software Interface Standard)" name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

   &lt;/device&gt;

   &lt;toolchain Tcompiler="IAR" Toutput="exe"/&gt;

   &lt;components&gt;

-    &lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.7.0"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/Core/html/index.html"/&gt;

       &lt;file category="include" name="CMSIS/Core/Include/"/&gt;

       &lt;file category="header" condition="TrustZone" name="CMSIS/Core/Include/tz_context.h"/&gt;

       &lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/main_s.c" select="Secure mode 'main' module for ARMv8-M" version="1.1.1"/&gt;

       &lt;file attr="template" category="sourceC" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/tz_context.c" select="RTOS Context Management (TrustZone for ARMv8-M)" version="1.1.1"/&gt;

     &lt;/component&gt;

-    &lt;component Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.5.2"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;component Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Csub="Keil RTX5" Cvariant="Source" Cvendor="ARM" Cversion="5.7.0"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/RTOS2/html/rtx5_impl.html"/&gt;

       &lt;file category="header" name="CMSIS/RTOS2/RTX/Include/rtx_os.h"/&gt;

-      &lt;file attr="config" category="header" name="CMSIS/RTOS2/RTX/Config/RTX_Config.h" version="5.5.1"/&gt;

-      &lt;file attr="config" category="source" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.1.0"/&gt;

+      &lt;file attr="config" category="header" name="CMSIS/RTOS2/RTX/Config/RTX_Config.h" version="5.6.0"/&gt;

+      &lt;file attr="config" category="source" name="CMSIS/RTOS2/RTX/Config/RTX_Config.c" version="5.2.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/main.c" select="CMSIS-RTOS2 'main' function" version="2.1.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/Events.c" select="CMSIS-RTOS2 Events" version="2.0.0"/&gt;

       &lt;file attr="template" category="source" name="CMSIS/RTOS2/RTX/Template/MemPool.c" select="CMSIS-RTOS2 Memory Pool" version="2.0.0"/&gt;

@@ -2241,19 +2271,19 @@
       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_system.c"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_evr.c"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/RTX/Source/rtx_lib.c"/&gt;

-      &lt;file category="source" condition="CM3_IAR" name="CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s"/&gt;

+      &lt;file category="source" condition="IARASM ARMv7-M" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv7m.s"/&gt;

       &lt;file category="source" name="CMSIS/RTOS2/Source/os_systick.c"/&gt;

     &lt;/component&gt;

     &lt;component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.2.2" deviceDependent="1"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="header" deviceDependent="1" name="Device/ARM/ARMCM3/Include/ARMCM3.h"/&gt;

       &lt;file attr="config" category="sourceAsm" condition="IAR" deviceDependent="1" name="Device/ARM/ARMCM3/Source/IAR/startup_ARMCM3.s" version="1.0.0"/&gt;

       &lt;file attr="config" category="sourceC" deviceDependent="1" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/&gt;

     &lt;/component&gt;

   &lt;/components&gt;

   &lt;apis&gt;

-    &lt;api Capiversion="2.1.3" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.1.3" exclusive="1"&gt;

-      &lt;package name="CMSIS" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0-dev5"/&gt;

+    &lt;api Capiversion="2.2.0" Cclass="CMSIS" Cgroup="RTOS2" Cvendor="ARM" Cversion="2.2.0" exclusive="1"&gt;

+      &lt;package name="CMSIS" url="https://www.keil.com/pack/" vendor="ARM" version="5.9.1"/&gt;

       &lt;file category="doc" name="CMSIS/Documentation/RTOS2/html/index.html"/&gt;

       &lt;file category="header" name="CMSIS/RTOS2/Include/cmsis_os2.h"/&gt;

     &lt;/api&gt;