diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
index 59fce204a..1a6a0ef72 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
@@ -368,6 +368,738 @@
+
+ Release_Large_Data_Model
+
+ MSP430
+
+ 1
+
+ C-SPY
+ 4
+
+ 25
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 430FET
+ 1
+
+ 22
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SIM430
+ 1
+
+ 4
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+ $TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin
+ 1
+
+
+ $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin
+ 1
+
+
+
+
+ Debug_Small_Data_Model
+
+ MSP430
+
+ 1
+
+ C-SPY
+ 4
+
+ 25
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 430FET
+ 1
+
+ 22
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SIM430
+ 1
+
+ 4
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+ $TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin
+ 1
+
+
+ $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin
+ 0
+
+
+ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin
+ 0
+
+
+ $EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin
+ 1
+
+
+ $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin
+ 1
+
+
+
diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index 6dd4adb01..a65a60456 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -894,6 +894,1790 @@
+
+ Release_Large_Data_Model
+
+ MSP430
+
+ 1
+
+ General
+ 7
+
+ 27
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ICC430
+ 4
+
+ 30
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A430
+ 4
+
+ 13
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CUSTOM
+ 3
+
+
+
+
+
+
+ BICOMP
+ 0
+
+
+
+ BUILDACTION
+ 1
+
+
+
+
+
+
+ XLINK
+ 4
+
+ 22
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XAR
+ 4
+
+ 0
+ 1
+ 1
+
+
+
+
+
+
+ BILINK
+ 0
+
+
+
+
+ Debug_Small_Data_Model
+
+ MSP430
+
+ 1
+
+ General
+ 7
+
+ 27
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ICC430
+ 4
+
+ 30
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A430
+ 4
+
+ 13
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CUSTOM
+ 3
+
+
+
+
+
+
+ BICOMP
+ 0
+
+
+
+ BUILDACTION
+ 1
+
+
+
+
+
+
+ XLINK
+ 4
+
+ 22
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XAR
+ 4
+
+ 0
+ 1
+ 1
+
+
+
+
+
+
+ BILINK
+ 0
+
+
+
F5XX_6XX_Core_Lib
diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c
index e38845e62..1495b09b8 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/main.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/main.c
@@ -126,7 +126,7 @@
* error has occurred. The nature of the reg test tasks necessitates that they
* are written in assembly code.
*
- * *NOTE 2* vApplicationSetupTimerInterrupt() is called by the kernel to let
+ * *NOTE 1* vApplicationSetupTimerInterrupt() is called by the kernel to let
* the application set up a timer to generate the tick interrupt. In this
* example a timer A0 is used for this purpose.
*
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
index a4de2e749..4ffdf65e8 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
@@ -6,7 +6,7 @@
- 300201622
+ 300Breakpoints201622
@@ -43,20 +43,20 @@
- 0TabID-31440-8210Debug LogDebug-Log0TabID-22030-8386Terminal I/OTerminalIO0
+ 0TabID-22030-8386Terminal I/OTerminalIO0TabID-3586-11188MemoryMemory012500125022000007760
- TextEditor$WS_DIR$\main.c024212197121970TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43014353395339TextEditor$WS_DIR$\FreeRTOSConfig.h07043854385TextEditor$WS_DIR$\..\..\Source\tasks.c016015126751267TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portmacro.h04836523697TextEditor$WS_DIR$\RegTest.s4303931503150TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\data_model.h04031243124TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c011657895789TextEditor$WS_DIR$\lnk430F5438A_mod.xcl0177512351230100000010000001
+ TextEditor$WS_DIR$\main.c02301219712197TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c011056555655TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43012254395439TextEditor$WS_DIR$\..\Common\Minimal\GenQTest.c0497173121731230100000010000001
- iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716470-2-2200200119048203666280952731161-2-21981682-2-216842001002381203666119048203666
+ iaridepm.enu1430fet1debuggergui.enu1-2-2716191-2-212115072024152749114881731161-2-2716470-2-2200200119048203666280952731161-2-21981682-2-216842001002381203666119048203666
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
index 855b4641b..4af8c4973 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
@@ -1,5 +1,5 @@
[DebugChecksum]
-Checksum=-130781403
+Checksum=-557929919
[DisAssemblyWindow]
NumStates=_ 1
State 1=_ 1
@@ -14,7 +14,7 @@ Control Register=0
NextState0=0
NextState1=0
[Action Register]
-Break=1
+Break=3
State Storage=0
[Profiling]
Enabled=0
@@ -39,11 +39,12 @@ LogFile=_ ""
Enabled=0
[DriverProfiling]
Enabled=0
-Mode=151407352
+Mode=604119078
Graph=0
Symbiont=0
[Breakpoints]
-Count=0
+Bp0=_ "STD_CODE" "{$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43}.155.1@1" 1 0 0 0 "" 0 ""
+Count=1
[FET]
Clock mode=14
Extended Clock mode=4047
diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
index ede8c1352..9c150f28a 100644
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
@@ -53,14 +53,14 @@
- TextEditor$WS_DIR$\main.c041125611256100100000010000001
+ TextEditor$WS_DIR$\main.c0387755775500100000010000001
- iaridepm.enu1-2-2645309-2-2331267197024271894185119658859-2-22931682-2-216842951002381300407197024271894
+ iaridepm.enu1-2-2645309-2-2331267197024271894185119658859-2-22931682-2-216842951002381300407197024271894