diff --git a/csharp/Facebook.Yoga/Native.cs b/csharp/Facebook.Yoga/Native.cs
index 1bdc24f0..f22e5888 100644
--- a/csharp/Facebook.Yoga/Native.cs
+++ b/csharp/Facebook.Yoga/Native.cs
@@ -73,6 +73,12 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern bool YGConfigGetUseLegacyStretchBehaviour(YGConfigHandle config);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetErrata(YGConfigHandle config, YogaErrata errata);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaErrata YGConfigGetErrata(YGConfigHandle config);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGConfigSetPointScaleFactor(
             YGConfigHandle config,
diff --git a/csharp/Facebook.Yoga/YogaConfig.cs b/csharp/Facebook.Yoga/YogaConfig.cs
index 8424401f..c4162d31 100644
--- a/csharp/Facebook.Yoga/YogaConfig.cs
+++ b/csharp/Facebook.Yoga/YogaConfig.cs
@@ -117,8 +117,12 @@ namespace Facebook.Yoga
             }
         }
 
-        public bool UseLegacyStretchBehaviour
-        {
+        [ObsoleteAttribute("\"UseLegacyStretchBehaviour\" will be removed in the next release. " +
+          "Usage should be replaced with \"Errata\" set to \"YogaErrata.All\" to opt out of all " +
+          "future breaking conformance fixes, or \"YogaErrata.StretchFlexBasis\" toopt out of " +
+          "the specific conformance fix previously disabled by \"UseLegacyStretchBehaviour\".",
+          true /*error*/)]
+        public bool UseLegacyStretchBehaviour {
             get
             {
                 return Native.YGConfigGetUseLegacyStretchBehaviour(_ygConfig);
@@ -130,6 +134,19 @@ namespace Facebook.Yoga
             }
         }
 
+        public YogaErrata Errata
+        {
+            get
+            {
+                return Native.YGConfigGetErrata(_ygConfig);
+            }
+
+            set
+            {
+                Native.YGConfigSetErrata(_ygConfig, value);
+            }
+        }
+
         public float PointScaleFactor
         {
             set