diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf
index 390f1e966..016bf823a 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf
index 44c662156..352db5365 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_attrib.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf
index 602c360a2..70c8c7e8a 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf
index 9a2507075..0cbe3630a 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf and b/libsrc/ffdec_lib/testdata/as3_embed/bin/as3_embed_classes.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as
index b358ed15d..fc4642e93 100644
--- a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesAir.as
@@ -12,6 +12,7 @@ package
     {                
         TestBinaryData;
         TestFont;
+        TestFontCFF;
         TestImage;
         TestImageGrid;
         //TestImageSvg;
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as
index 424766a2d..6b12f0c2e 100644
--- a/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/MainClassesFlex.as
@@ -11,7 +11,8 @@ package
     public class MainClassesFlex extends Sprite
     {                
         TestBinaryData;
-        //TestFont;
+        TestFont;
+        //TestFontCFF;
         TestImage;
         TestImageGrid;
         TestImageSvg;
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as
index ccf1ea01b..59f87631f 100644
--- a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedAir.as
@@ -32,9 +32,29 @@ package embed_attributes
         [Embed(source="../../assets/sound.mp3")] 
         public var soundClass:Class; 
         
-        //not supported in Flex, AIR only
-        [Embed(source="../../assets/font.ttf", fontFamily="Great Vibes", fontWeight= "normal", fontStyle = "normal", mimeType="application/x-font-truetype")]
+        [Embed(
+          source="../../assets/font.ttf",
+          fontFamily="Great Vibes",
+          fontWeight="normal",
+          fontStyle="normal",
+          mimeType="application/x-font-truetype",
+          unicodeRange="U+0020,U+0041-005A", 
+      	  advancedAntiAliasing="true",
+          embedAsCFF="false"
+          )]
         public var fontClass:Class;
+        
+        [Embed(
+          source="../../assets/font.ttf",
+          fontFamily="Great Vibes",
+          fontWeight="normal",
+          fontStyle="normal",
+          mimeType="application/x-font-truetype",
+          unicodeRange="U+0030-0039,U+002E", 
+      	  advancedAntiAliasing="true",
+          embedAsCFF="true"
+          )]
+        public var fontClassCFF:Class;
                 
         [Embed(source="../../assets/data.bin", mimeType="application/octet-stream")] 
         public var binaryDataClass:Class; 
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as
index c9c6f9c1a..01e20e6c0 100644
--- a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_attributes/TestEmbedFlex.as
@@ -32,10 +32,18 @@ package embed_attributes
         [Embed(source="../../assets/sound.mp3")] 
         public var soundClass:Class; 
         
-        //not supported in Flex, AIR only
-        //[Embed(source="../../assets/font.ttf", fontFamily="Great Vibes", fontWeight= "normal", fontStyle = "normal", mimeType="application/x-font-truetype")]
-        //public var fontClass:Class;
-                
+        [Embed(
+          source="../../assets/font.ttf",
+          fontFamily="Great Vibes",
+          fontWeight="normal",
+          fontStyle="normal",
+          mimeType="application/x-font-truetype",
+          unicodeRange="U+0020,U+0041-005A", 
+      	  advancedAntiAliasing="true",
+          embedAsCFF="false"
+          )]
+        public var fontClass:Class;
+                     
         [Embed(source="../../assets/data.bin", mimeType="application/octet-stream")] 
         public var binaryDataClass:Class;                 
         
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as
index f31510443..0929816a6 100644
--- a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFont.as
@@ -2,8 +2,16 @@ package embed_classes
 { 
     import flash.text.Font;
     
-    //not supported in Flex, AIR only
-    [Embed(source="../../assets/font.ttf", fontFamily="Great Vibes", fontWeight= "normal", fontStyle = "normal", mimeType="application/x-font-truetype")]
+    [Embed(
+    source="../../assets/font.ttf",
+    fontFamily="Great Vibes",
+    fontWeight="normal",
+    fontStyle="normal",
+    mimeType="application/x-font-truetype",
+    unicodeRange="U+0020,U+0041-005A", 
+	advancedAntiAliasing="true",
+    embedAsCFF="false"
+    )]
     public class TestFont extends Font
     {
     } 
diff --git a/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFontCFF.as b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFontCFF.as
new file mode 100644
index 000000000..ae5c2e2d6
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_embed/src/embed_classes/TestFontCFF.as
@@ -0,0 +1,18 @@
+package embed_classes
+{ 
+    import flash.text.Font;
+    
+    [Embed(
+    source="../../assets/font.ttf",
+    fontFamily="Great Vibes",
+    fontWeight="normal",
+    fontStyle="normal",
+    mimeType="application/x-font-truetype",
+    unicodeRange="U+0030-0039,U+002E", 
+	advancedAntiAliasing="true",
+    embedAsCFF="true"
+    )]
+    public class TestFontCFF extends Font
+    {
+    } 
+}