diff --git a/drivers/FileLike.h b/drivers/FileLike.h
index e4f323918e1..f213272021c 100644
--- a/drivers/FileLike.h
+++ b/drivers/FileLike.h
@@ -16,7 +16,7 @@
 #ifndef MBED_FILELIKE_H
 #define MBED_FILELIKE_H
 
-#include "platform/toolchain.h"
+#include "platform/mbed_toolchain.h"
 #include "drivers/FileBase.h"
 
 namespace mbed {
diff --git a/features/TESTS/filesystem/fat_filesystem/main.cpp b/features/TESTS/filesystem/fat_filesystem/main.cpp
index 717aa5990ee..5ef12fb4716 100644
--- a/features/TESTS/filesystem/fat_filesystem/main.cpp
+++ b/features/TESTS/filesystem/fat_filesystem/main.cpp
@@ -21,7 +21,7 @@
 #include "HeapBlockDevice.h"
 #include "FATFileSystem.h"
 #include <stdlib.h>
-#include "retarget.h"
+#include "mbed_retarget.h"
 
 using namespace utest::v1;
 
diff --git a/mbed.h b/mbed.h
index 4ec380812a0..d9764740be7 100644
--- a/mbed.h
+++ b/mbed.h
@@ -16,13 +16,13 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 123
+#define MBED_LIBRARY_VERSION 138
 
 #if MBED_CONF_RTOS_PRESENT
 // RTOS present, this is valid only for mbed OS 5
 #define MBED_MAJOR_VERSION 5
-#define MBED_MINOR_VERSION 2
-#define MBED_PATCH_VERSION 1
+#define MBED_MINOR_VERSION 4
+#define MBED_PATCH_VERSION 0
 
 #else
 // mbed 2
diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
index e0cdbac6406..bff1d59a699 100644
--- a/platform/mbed_retarget.cpp
+++ b/platform/mbed_retarget.cpp
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #endif
 #include <errno.h>
-#include "platform/retarget.h"
+#include "platform/mbed_retarget.h"
 
 
 #if defined(__ARMCC_VERSION)
diff --git a/platform/retarget.h b/platform/mbed_retarget.h
similarity index 100%
rename from platform/retarget.h
rename to platform/mbed_retarget.h
diff --git a/platform/platform.h b/platform/platform.h
index 6e2996ae32d..a5802ff655e 100644
--- a/platform/platform.h
+++ b/platform/platform.h
@@ -24,8 +24,8 @@
 #include <cstdio>
 #include <cstring>
 
-#include "platform/retarget.h"
-#include "platform/toolchain.h"
+#include "platform/mbed_retarget.h"
+#include "platform/mbed_toolchain.h"
 #include "device.h"
 #include "PinNames.h"
 #include "PeripheralNames.h"
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/device/TOOLCHAIN_IAR/stm32f429xx_flash.icf b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/device/TOOLCHAIN_IAR/stm32f429xx_flash.icf
index b9efffd6605..c2b9d0d7f88 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/device/TOOLCHAIN_IAR/stm32f429xx_flash.icf
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/device/TOOLCHAIN_IAR/stm32f429xx_flash.icf
@@ -15,9 +15,9 @@ define symbol __ICFEDIT_region_RAM_end__      = 0x2002FFFF;
 define symbol __ICFEDIT_region_CCMRAM_start__ = 0x10000000;
 define symbol __ICFEDIT_region_CCMRAM_end__   = 0x1000FFFF;
 /*-Sizes-*/
-/*Heap 1/4 of ram and stack 1/8*/
+/*Heap 1/2 of ram and stack 1/8*/
 define symbol __ICFEDIT_size_cstack__ = 0x6000;
-define symbol __ICFEDIT_size_heap__   = 0xC000;
+define symbol __ICFEDIT_size_heap__   = 0x18000;
 /**** End of ICF editor section. ###ICF###*/
 
 
@@ -36,4 +36,4 @@ place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 
 place in ROM_region   { readonly };
 place in RAM_region   { readwrite,
-                        block CSTACK, block HEAP };
\ No newline at end of file
+                        block CSTACK, block HEAP };
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_IAR/stm32f439xx_flash.icf b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_IAR/stm32f439xx_flash.icf
index b9efffd6605..c2b9d0d7f88 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_IAR/stm32f439xx_flash.icf
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/TOOLCHAIN_IAR/stm32f439xx_flash.icf
@@ -15,9 +15,9 @@ define symbol __ICFEDIT_region_RAM_end__      = 0x2002FFFF;
 define symbol __ICFEDIT_region_CCMRAM_start__ = 0x10000000;
 define symbol __ICFEDIT_region_CCMRAM_end__   = 0x1000FFFF;
 /*-Sizes-*/
-/*Heap 1/4 of ram and stack 1/8*/
+/*Heap 1/2 of ram and stack 1/8*/
 define symbol __ICFEDIT_size_cstack__ = 0x6000;
-define symbol __ICFEDIT_size_heap__   = 0xC000;
+define symbol __ICFEDIT_size_heap__   = 0x18000;
 /**** End of ICF editor section. ###ICF###*/
 
 
@@ -36,4 +36,4 @@ place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 
 place in ROM_region   { readonly };
 place in RAM_region   { readwrite,
-                        block CSTACK, block HEAP };
\ No newline at end of file
+                        block CSTACK, block HEAP };
diff --git a/tools/export/iar/ewd.tmpl b/tools/export/iar/ewd.tmpl
index b2daa91c766..c5b321dcb38 100644
--- a/tools/export/iar/ewd.tmpl
+++ b/tools/export/iar/ewd.tmpl
@@ -348,7 +348,7 @@
         </option>
         <option>
           <name>CMSISDAPInterfaceRadio</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CMSISDAPInterfaceCmdLine</name>
diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index f571ebeaf8c..154a56ca045 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -178,6 +178,16 @@ def format_src(self, srcs):
                                     key=lambda (_, __, name): name.lower())
         return grouped
 
+    @staticmethod
+    def format_fpu(core):
+        """Generate a core's FPU string"""
+        if core.endswith("FD"):
+            return "FPU3(DFPU)"
+        elif core.endswith("F"):
+            return "FPU2"
+        else:
+            return ""
+
     def generate(self):
         """Generate the .uvproj file"""
         cache = Cache(True, False)
@@ -197,10 +207,11 @@ def generate(self):
             'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'),
             'device': DeviceUvision(self.target),
         }
-        ctx['cputype'] = ctx['device'].core.rstrip("FD")
+        core = ctx['device'].core
+        ctx['cputype'] = core.rstrip("FD")
         # Turn on FPU optimizations if the core has an FPU
-        ctx['fpu_setting'] = 1 if 'f' not in ctx['device'].core.lower() \
-                                  or 'd' in ctx['device'].core.lower() else 2
+        ctx['fpu_setting'] = 1 if 'F' not in core or 'D' in core else 2
+        ctx['fputype'] = self.format_fpu(core)
         ctx.update(self.format_flags())
         self.gen_file('uvision/uvision.tmpl', ctx, self.project_name+".uvprojx")
         self.gen_file('uvision/uvision_debug.tmpl', ctx, self.project_name + ".uvoptx")
diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index b8524088cd1..4ccb9a32281 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -16,7 +16,7 @@
           <Vendor>{{device.dvendor}}</Vendor>
           <PackID>{{device.pack_id}}</PackID>
           <PackURL>{{device.pack_url}}</PackURL>
-          <Cpu>CPUTYPE("{{cputype}}")</Cpu>
+          <Cpu>CPUTYPE("{{cputype}}") {{fputype}}</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll>{{device.flash_dll}}</FlashDriverDll>