diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.cproject b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.cproject
index af66ac48d9..393dc4ad67 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.cproject
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.cproject
@@ -92,6 +92,7 @@
 								<option id="com.renesas.cdt.core.Compiler.option.warning30.1994659686" name="Issue Warning about c and ansi c construct incompatibility(-Wtraditional)" superClass="com.renesas.cdt.core.Compiler.option.warning30" value="false" valueType="boolean"/>
 								<option id="com.renesas.cdt.core.Compiler.option.warning31.531473224" name="Give string constants the type 'const char[length]'(-Wwrite-strings)" superClass="com.renesas.cdt.core.Compiler.option.warning31" value="false" valueType="boolean"/>
 								<option id="com.renesas.cdt.core.Compiler.option.CPUSeries.114360178" name="Cpu Series" superClass="com.renesas.cdt.core.Compiler.option.CPUSeries"/>
+								<option id="com.renesas.cdt.rz.HardwareDebug.Compiler.option.optimizationLevel.2026925660" name="Optimization Level" superClass="com.renesas.cdt.rz.HardwareDebug.Compiler.option.optimizationLevel" value="com.renesas.cdt.rz.HardwareDebug.Compiler.option.optimizationLevel.speedCodeSize" valueType="enumerated"/>
 								<inputType id="%Base.Compiler.C.InputType.Id.321945067" name="C Input" superClass="%Base.Compiler.C.InputType.Id"/>
 								<inputType id="Base.Compiler.CPP.InputType.Id.678276075" name="C++ Input" superClass="Base.Compiler.CPP.InputType.Id"/>
 							</tool>
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.settings/language.settings.xml b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.settings/language.settings.xml
index 53816e4336..546c39b1ef 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/.settings/language.settings.xml
@@ -3,7 +3,7 @@
 	<configuration id="com.renesas.cdt.rz.hardwaredebug.win32.configuration.Id.137003302" name="HardwareDebug">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider class="com.renesas.cdt.common.build.spec.RZGCCBuiltinSpecsDetector" console="false" env-hash="-542772021278886125" id="RZGCCBuiltinSpecsDetector" keep-relative-paths="false" name="Renesas GNUARM-NONE GCCBuildinCompilerSettings" options-hash="857384749" parameter="arm-none-eabi-gcc -E -P -v -dD ${INPUTS}" prefer-non-shared="true">
+			<provider class="com.renesas.cdt.common.build.spec.RZGCCBuiltinSpecsDetector" console="false" env-hash="1695716901026871493" id="RZGCCBuiltinSpecsDetector" keep-relative-paths="false" name="Renesas GNUARM-NONE GCCBuildinCompilerSettings" options-hash="857384749" parameter="arm-none-eabi-gcc -E -P -v -dD ${INPUTS}" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/GCC/src/loader_init2.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/GCC/src/loader_init2.c
index 70301684a0..394872d3e2 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/GCC/src/loader_init2.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/GCC/src/loader_init2.c
@@ -121,8 +121,8 @@ void loader_init2 (void)
 ***********************************************************************************************************************/
 static void reset_check(void)
 {
-    volatile uint8_t result;
-    volatile uint32_t dummy;
+    volatile uint8_t result=0;
+    volatile uint32_t dummy=0;
     
     UNUSED_VARIABLE(result);
     UNUSED_VARIABLE(dummy);
@@ -196,7 +196,7 @@ static void reset_check(void)
 ***********************************************************************************************************************/
 static void cpg_init(void)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
 
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_atcm_init.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_atcm_init.c
index 6c17a6afbf..1c135f3088 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_atcm_init.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_atcm_init.c
@@ -85,7 +85,7 @@ Private variables and functions
 ***********************************************************************************************************************/
 void R_ATCM_WaitSet(uint32_t atcm_wait)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
   
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_ram_init.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_ram_init.c
index 65ee8c9e36..0decedda88 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_ram_init.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_ram_init.c
@@ -108,7 +108,7 @@ void R_RAM_ECCEnable(void)
 ***********************************************************************************************************************/
 void R_RAM_WriteEnable(void)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
     
@@ -134,7 +134,7 @@ void R_RAM_WriteEnable(void)
 ***********************************************************************************************************************/
 void R_RAM_WriteDisable(void)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
     
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_reset.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_reset.c
index 9218763e63..9c21394e5e 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_reset.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/System/r_reset.c
@@ -85,7 +85,7 @@ Private variables and functions
 ***********************************************************************************************************************/
 void r_rst_write_enable(void)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
   
@@ -109,7 +109,7 @@ void r_rst_write_enable(void)
 ***********************************************************************************************************************/
 void r_rst_write_disable(void)
 {
-    volatile uint32_t dummy; 
+    volatile uint32_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
   
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/Full_Demo/main_full.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/Full_Demo/main_full.c
index bc5b0cc1e1..f803715598 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/Full_Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/Full_Demo/main_full.c
@@ -89,13 +89,6 @@
  * In addition to the standard demo tasks, the following tasks and tests are
  * defined and/or created within this file:
  *
- * FreeRTOS+CLI command console.  For reasons of robustness testing the UART
- * driver is deliberately written to be inefficient and should not be used as a
- * template for a production driver.  Type "help" to see a list of registered
- * commands.  The FreeRTOS+CLI license is different to the FreeRTOS license, see
- * http://www.FreeRTOS.org/cli for license and usage details.  The default baud
- * rate is 115200.
- *
  * "Reg test" tasks - These fill both the core and floating point registers with
  * known values, then check that each register maintains its expected value for
  * the lifetime of the task.  Each task uses a different set of values.  The reg
@@ -212,17 +205,6 @@ extern void vRegTest1Implementation( void );
 static void prvRegTestTaskEntry2( void *pvParameters );
 extern void vRegTest2Implementation( void );
 
-/*
- * Register commands that can be used with FreeRTOS+CLI.  The commands are
- * defined in CLI-Commands.c and File-Related-CLI-Command.c respectively.
- */
-extern void vRegisterSampleCLICommands( void );
-
-/*
- * The task that manages the FreeRTOS+CLI input and output.
- */
-extern void vUARTCommandConsoleStart( uint16_t usStackSize, UBaseType_t uxPriority );
-
 /*
  * A high priority task that does nothing other than execute at a pseudo random
  * time to ensure the other test tasks don't just execute in a repeating
@@ -263,15 +245,6 @@ void main_full( void )
 	vStartTaskNotifyTask();
 	vStartInterruptSemaphoreTasks();
 
-
-	/* Start the tasks that implements the command console on the UART, as
-	described above. */
-#warning CLI is commented out
-//	vUARTCommandConsoleStart( mainUART_COMMAND_CONSOLE_STACK_SIZE, mainUART_COMMAND_CONSOLE_TASK_PRIORITY );
-
-	/* Register the standard CLI commands. */
-//	vRegisterSampleCLICommands();
-
 	/* Create the register check tasks, as described at the top of this	file */
 	xTaskCreate( prvRegTestTaskEntry1, "Reg1", configMINIMAL_STACK_SIZE, mainREG_TEST_TASK_1_PARAMETER, tskIDLE_PRIORITY, NULL );
 	xTaskCreate( prvRegTestTaskEntry2, "Reg2", configMINIMAL_STACK_SIZE, mainREG_TEST_TASK_2_PARAMETER, tskIDLE_PRIORITY, NULL );
diff --git a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/cg_src/r_cg_mpc.c b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/cg_src/r_cg_mpc.c
index a403df1fe3..56a770f872 100644
--- a/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/cg_src/r_cg_mpc.c
+++ b/FreeRTOS/Demo/CORTEX_R4F_RZ_T_GCC_IAR_ARM/src/cg_src/r_cg_mpc.c
@@ -113,7 +113,7 @@ void R_MPC_Create_UserInit(void)
 ***********************************************************************************************************************/
 void R_MPC_WriteEnable(void)
 {
-    volatile uint8_t dummy; 
+    volatile uint8_t dummy=0;
 
     UNUSED_VARIABLE(dummy);
   
@@ -138,7 +138,7 @@ void R_MPC_WriteEnable(void)
 ***********************************************************************************************************************/
 void R_MPC_WriteDisable(void)
 {
-    volatile uint8_t dummy; 
+    volatile uint8_t dummy=0;
 
     UNUSED_PARAM(dummy);