diff --git a/external/corefx b/external/corefx
index 10a41e9f9828..3baa35f64016 160000
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit 10a41e9f9828b3e299215406eadfde2ee4c9b29f
+Subproject commit 3baa35f64016a2a1acb62dcfb5c29cca6461ae9c
diff --git a/mcs/class/Facades/System.Drawing.Common/Makefile b/mcs/class/Facades/System.Drawing.Common/Makefile
index 71ad4c3ddb26..2c9b19c6979e 100644
--- a/mcs/class/Facades/System.Drawing.Common/Makefile
+++ b/mcs/class/Facades/System.Drawing.Common/Makefile
@@ -13,7 +13,7 @@ KEYFILE = ../../Open.snk
 LIBRARY_SNK = $(KEYFILE)
 SIGN_FLAGS = /delaysign /nowarn:1616,1699
 LIB_REFS = System
-LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
+LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) -d:FEATURE_TYPECONVERTER
 
 ifneq (,$(filter build net_4_x, $(PROFILE)))
 $(error This profile shouldn't build System.Drawing.Common.dll, it already has System.Drawing.dll)