diff --git a/gentest/fixtures/YGJustifyContentTest.html b/gentest/fixtures/YGJustifyContentTest.html
index 13e9987cfa..5f665fa294 100644
--- a/gentest/fixtures/YGJustifyContentTest.html
+++ b/gentest/fixtures/YGJustifyContentTest.html
@@ -157,13 +157,15 @@
   <div style="width: 40px;"></div>
 </div>
 
-<div id="justify_content_overflow_row_reverse_space_around" style="width: 102px; height: 102px; flex-direction: row-reverse; justify-content: space-around;">
+<!-- TODO T208209388: fallback to start vs flexstart in overflowed cases -->
+<div data-disabled="true" id="justify_content_overflow_row_reverse_space_around" style="width: 102px; height: 102px; flex-direction: row-reverse; justify-content: space-around;">
   <div style="width: 40px;"></div>
   <div style="width: 40px;"></div>
   <div style="width: 40px;"></div>
 </div>
 
-<div id="justify_content_overflow_row_reverse_space_evenly" style="width: 102px; height: 102px; flex-direction: row-reverse; justify-content: space-evenly;">
+<!-- TODO T208209388: fallback to start vs flexstart in overflowed cases -->
+<div data-disabled="true" id="justify_content_overflow_row_reverse_space_evenly" style="width: 102px; height: 102px; flex-direction: row-reverse; justify-content: space-evenly;">
   <div style="width: 40px;"></div>
   <div style="width: 40px;"></div>
   <div style="width: 40px;"></div>
diff --git a/java/tests/generated/com/facebook/yoga/YGJustifyContentTest.java b/java/tests/generated/com/facebook/yoga/YGJustifyContentTest.java
index 431f51c198..fa47b0c3b5 100644
--- a/java/tests/generated/com/facebook/yoga/YGJustifyContentTest.java
+++ b/java/tests/generated/com/facebook/yoga/YGJustifyContentTest.java
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6aaf6f020cdc74d09e440206957507aa>>
+ * @generated SignedSource<<ebd50ee9980922e7e6f3beabff5375ea>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGJustifyContentTest.html
  */
 
@@ -1790,6 +1790,7 @@ public void test_justify_content_overflow_row_space_evenly() {
   }
 
   @Test
+  @Ignore
   public void test_justify_content_overflow_row_reverse_space_around() {
     YogaConfig config = YogaConfigFactory.create();
 
@@ -1819,17 +1820,17 @@ public void test_justify_content_overflow_row_reverse_space_around() {
     assertEquals(102f, root.getLayoutWidth(), 0.0f);
     assertEquals(102f, root.getLayoutHeight(), 0.0f);
 
-    assertEquals(62f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(80f, root_child0.getLayoutX(), 0.0f);
     assertEquals(0f, root_child0.getLayoutY(), 0.0f);
     assertEquals(40f, root_child0.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child0.getLayoutHeight(), 0.0f);
 
-    assertEquals(22f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(40f, root_child1.getLayoutX(), 0.0f);
     assertEquals(0f, root_child1.getLayoutY(), 0.0f);
     assertEquals(40f, root_child1.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child1.getLayoutHeight(), 0.0f);
 
-    assertEquals(-18f, root_child2.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child2.getLayoutX(), 0.0f);
     assertEquals(0f, root_child2.getLayoutY(), 0.0f);
     assertEquals(40f, root_child2.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child2.getLayoutHeight(), 0.0f);
@@ -1842,23 +1843,24 @@ public void test_justify_content_overflow_row_reverse_space_around() {
     assertEquals(102f, root.getLayoutWidth(), 0.0f);
     assertEquals(102f, root.getLayoutHeight(), 0.0f);
 
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(-18f, root_child0.getLayoutX(), 0.0f);
     assertEquals(0f, root_child0.getLayoutY(), 0.0f);
     assertEquals(40f, root_child0.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child0.getLayoutHeight(), 0.0f);
 
-    assertEquals(40f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(22f, root_child1.getLayoutX(), 0.0f);
     assertEquals(0f, root_child1.getLayoutY(), 0.0f);
     assertEquals(40f, root_child1.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child1.getLayoutHeight(), 0.0f);
 
-    assertEquals(80f, root_child2.getLayoutX(), 0.0f);
+    assertEquals(62f, root_child2.getLayoutX(), 0.0f);
     assertEquals(0f, root_child2.getLayoutY(), 0.0f);
     assertEquals(40f, root_child2.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child2.getLayoutHeight(), 0.0f);
   }
 
   @Test
+  @Ignore
   public void test_justify_content_overflow_row_reverse_space_evenly() {
     YogaConfig config = YogaConfigFactory.create();
 
@@ -1888,17 +1890,17 @@ public void test_justify_content_overflow_row_reverse_space_evenly() {
     assertEquals(102f, root.getLayoutWidth(), 0.0f);
     assertEquals(102f, root.getLayoutHeight(), 0.0f);
 
-    assertEquals(62f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(80f, root_child0.getLayoutX(), 0.0f);
     assertEquals(0f, root_child0.getLayoutY(), 0.0f);
     assertEquals(40f, root_child0.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child0.getLayoutHeight(), 0.0f);
 
-    assertEquals(22f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(40f, root_child1.getLayoutX(), 0.0f);
     assertEquals(0f, root_child1.getLayoutY(), 0.0f);
     assertEquals(40f, root_child1.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child1.getLayoutHeight(), 0.0f);
 
-    assertEquals(-18f, root_child2.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child2.getLayoutX(), 0.0f);
     assertEquals(0f, root_child2.getLayoutY(), 0.0f);
     assertEquals(40f, root_child2.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child2.getLayoutHeight(), 0.0f);
@@ -1911,17 +1913,17 @@ public void test_justify_content_overflow_row_reverse_space_evenly() {
     assertEquals(102f, root.getLayoutWidth(), 0.0f);
     assertEquals(102f, root.getLayoutHeight(), 0.0f);
 
-    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(-18f, root_child0.getLayoutX(), 0.0f);
     assertEquals(0f, root_child0.getLayoutY(), 0.0f);
     assertEquals(40f, root_child0.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child0.getLayoutHeight(), 0.0f);
 
-    assertEquals(40f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(22f, root_child1.getLayoutX(), 0.0f);
     assertEquals(0f, root_child1.getLayoutY(), 0.0f);
     assertEquals(40f, root_child1.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child1.getLayoutHeight(), 0.0f);
 
-    assertEquals(80f, root_child2.getLayoutX(), 0.0f);
+    assertEquals(62f, root_child2.getLayoutX(), 0.0f);
     assertEquals(0f, root_child2.getLayoutY(), 0.0f);
     assertEquals(40f, root_child2.getLayoutWidth(), 0.0f);
     assertEquals(102f, root_child2.getLayoutHeight(), 0.0f);
diff --git a/javascript/tests/generated/YGJustifyContentTest.test.ts b/javascript/tests/generated/YGJustifyContentTest.test.ts
index 97869b22a3..63f814f1a2 100644
--- a/javascript/tests/generated/YGJustifyContentTest.test.ts
+++ b/javascript/tests/generated/YGJustifyContentTest.test.ts
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<4d367d399575872c385f254588d91fb5>>
+ * @generated SignedSource<<d9c3d3430edadef3cd6ba8bbacbb31a2>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGJustifyContentTest.html
  */
 
@@ -1925,7 +1925,7 @@ test('justify_content_overflow_row_space_evenly', () => {
     config.free();
   }
 });
-test('justify_content_overflow_row_reverse_space_around', () => {
+test.skip('justify_content_overflow_row_reverse_space_around', () => {
   const config = Yoga.Config.create();
   let root;
 
@@ -1955,17 +1955,17 @@ test('justify_content_overflow_row_reverse_space_around', () => {
     expect(root.getComputedWidth()).toBe(102);
     expect(root.getComputedHeight()).toBe(102);
 
-    expect(root_child0.getComputedLeft()).toBe(62);
+    expect(root_child0.getComputedLeft()).toBe(80);
     expect(root_child0.getComputedTop()).toBe(0);
     expect(root_child0.getComputedWidth()).toBe(40);
     expect(root_child0.getComputedHeight()).toBe(102);
 
-    expect(root_child1.getComputedLeft()).toBe(22);
+    expect(root_child1.getComputedLeft()).toBe(40);
     expect(root_child1.getComputedTop()).toBe(0);
     expect(root_child1.getComputedWidth()).toBe(40);
     expect(root_child1.getComputedHeight()).toBe(102);
 
-    expect(root_child2.getComputedLeft()).toBe(-18);
+    expect(root_child2.getComputedLeft()).toBe(0);
     expect(root_child2.getComputedTop()).toBe(0);
     expect(root_child2.getComputedWidth()).toBe(40);
     expect(root_child2.getComputedHeight()).toBe(102);
@@ -1977,17 +1977,17 @@ test('justify_content_overflow_row_reverse_space_around', () => {
     expect(root.getComputedWidth()).toBe(102);
     expect(root.getComputedHeight()).toBe(102);
 
-    expect(root_child0.getComputedLeft()).toBe(0);
+    expect(root_child0.getComputedLeft()).toBe(-18);
     expect(root_child0.getComputedTop()).toBe(0);
     expect(root_child0.getComputedWidth()).toBe(40);
     expect(root_child0.getComputedHeight()).toBe(102);
 
-    expect(root_child1.getComputedLeft()).toBe(40);
+    expect(root_child1.getComputedLeft()).toBe(22);
     expect(root_child1.getComputedTop()).toBe(0);
     expect(root_child1.getComputedWidth()).toBe(40);
     expect(root_child1.getComputedHeight()).toBe(102);
 
-    expect(root_child2.getComputedLeft()).toBe(80);
+    expect(root_child2.getComputedLeft()).toBe(62);
     expect(root_child2.getComputedTop()).toBe(0);
     expect(root_child2.getComputedWidth()).toBe(40);
     expect(root_child2.getComputedHeight()).toBe(102);
@@ -1999,7 +1999,7 @@ test('justify_content_overflow_row_reverse_space_around', () => {
     config.free();
   }
 });
-test('justify_content_overflow_row_reverse_space_evenly', () => {
+test.skip('justify_content_overflow_row_reverse_space_evenly', () => {
   const config = Yoga.Config.create();
   let root;
 
@@ -2029,17 +2029,17 @@ test('justify_content_overflow_row_reverse_space_evenly', () => {
     expect(root.getComputedWidth()).toBe(102);
     expect(root.getComputedHeight()).toBe(102);
 
-    expect(root_child0.getComputedLeft()).toBe(62);
+    expect(root_child0.getComputedLeft()).toBe(80);
     expect(root_child0.getComputedTop()).toBe(0);
     expect(root_child0.getComputedWidth()).toBe(40);
     expect(root_child0.getComputedHeight()).toBe(102);
 
-    expect(root_child1.getComputedLeft()).toBe(22);
+    expect(root_child1.getComputedLeft()).toBe(40);
     expect(root_child1.getComputedTop()).toBe(0);
     expect(root_child1.getComputedWidth()).toBe(40);
     expect(root_child1.getComputedHeight()).toBe(102);
 
-    expect(root_child2.getComputedLeft()).toBe(-18);
+    expect(root_child2.getComputedLeft()).toBe(0);
     expect(root_child2.getComputedTop()).toBe(0);
     expect(root_child2.getComputedWidth()).toBe(40);
     expect(root_child2.getComputedHeight()).toBe(102);
@@ -2051,17 +2051,17 @@ test('justify_content_overflow_row_reverse_space_evenly', () => {
     expect(root.getComputedWidth()).toBe(102);
     expect(root.getComputedHeight()).toBe(102);
 
-    expect(root_child0.getComputedLeft()).toBe(0);
+    expect(root_child0.getComputedLeft()).toBe(-18);
     expect(root_child0.getComputedTop()).toBe(0);
     expect(root_child0.getComputedWidth()).toBe(40);
     expect(root_child0.getComputedHeight()).toBe(102);
 
-    expect(root_child1.getComputedLeft()).toBe(40);
+    expect(root_child1.getComputedLeft()).toBe(22);
     expect(root_child1.getComputedTop()).toBe(0);
     expect(root_child1.getComputedWidth()).toBe(40);
     expect(root_child1.getComputedHeight()).toBe(102);
 
-    expect(root_child2.getComputedLeft()).toBe(80);
+    expect(root_child2.getComputedLeft()).toBe(62);
     expect(root_child2.getComputedTop()).toBe(0);
     expect(root_child2.getComputedWidth()).toBe(40);
     expect(root_child2.getComputedHeight()).toBe(102);
diff --git a/tests/generated/YGJustifyContentTest.cpp b/tests/generated/YGJustifyContentTest.cpp
index 0552bd4931..6f4443227c 100644
--- a/tests/generated/YGJustifyContentTest.cpp
+++ b/tests/generated/YGJustifyContentTest.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * clang-format off
- * @generated SignedSource<<acb28ab0d3486089ff07a8763f92e22f>>
+ * @generated SignedSource<<07092062f14f233462a4678c392df76a>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGJustifyContentTest.html
  */
 
@@ -1803,6 +1803,8 @@ TEST(YogaTest, justify_content_overflow_row_space_evenly) {
 }
 
 TEST(YogaTest, justify_content_overflow_row_reverse_space_around) {
+  GTEST_SKIP();
+
   YGConfigRef config = YGConfigNew();
 
   YGNodeRef root = YGNodeNewWithConfig(config);
@@ -1830,17 +1832,17 @@ TEST(YogaTest, justify_content_overflow_row_reverse_space_around) {
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetWidth(root));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root));
 
-  ASSERT_FLOAT_EQ(62, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(80, YGNodeLayoutGetLeft(root_child0));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child0));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child0));
 
-  ASSERT_FLOAT_EQ(22, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_FLOAT_EQ(40, YGNodeLayoutGetLeft(root_child1));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child1));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child1));
 
-  ASSERT_FLOAT_EQ(-18, YGNodeLayoutGetLeft(root_child2));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child2));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child2));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child2));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child2));
@@ -1852,17 +1854,17 @@ TEST(YogaTest, justify_content_overflow_row_reverse_space_around) {
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetWidth(root));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root));
 
-  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(-18, YGNodeLayoutGetLeft(root_child0));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child0));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child0));
 
-  ASSERT_FLOAT_EQ(40, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_FLOAT_EQ(22, YGNodeLayoutGetLeft(root_child1));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child1));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child1));
 
-  ASSERT_FLOAT_EQ(80, YGNodeLayoutGetLeft(root_child2));
+  ASSERT_FLOAT_EQ(62, YGNodeLayoutGetLeft(root_child2));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child2));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child2));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child2));
@@ -1873,6 +1875,8 @@ TEST(YogaTest, justify_content_overflow_row_reverse_space_around) {
 }
 
 TEST(YogaTest, justify_content_overflow_row_reverse_space_evenly) {
+  GTEST_SKIP();
+
   YGConfigRef config = YGConfigNew();
 
   YGNodeRef root = YGNodeNewWithConfig(config);
@@ -1900,17 +1904,17 @@ TEST(YogaTest, justify_content_overflow_row_reverse_space_evenly) {
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetWidth(root));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root));
 
-  ASSERT_FLOAT_EQ(62, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(80, YGNodeLayoutGetLeft(root_child0));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child0));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child0));
 
-  ASSERT_FLOAT_EQ(22, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_FLOAT_EQ(40, YGNodeLayoutGetLeft(root_child1));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child1));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child1));
 
-  ASSERT_FLOAT_EQ(-18, YGNodeLayoutGetLeft(root_child2));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child2));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child2));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child2));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child2));
@@ -1922,17 +1926,17 @@ TEST(YogaTest, justify_content_overflow_row_reverse_space_evenly) {
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetWidth(root));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root));
 
-  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(-18, YGNodeLayoutGetLeft(root_child0));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child0));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child0));
 
-  ASSERT_FLOAT_EQ(40, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_FLOAT_EQ(22, YGNodeLayoutGetLeft(root_child1));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child1));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child1));
 
-  ASSERT_FLOAT_EQ(80, YGNodeLayoutGetLeft(root_child2));
+  ASSERT_FLOAT_EQ(62, YGNodeLayoutGetLeft(root_child2));
   ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child2));
   ASSERT_FLOAT_EQ(40, YGNodeLayoutGetWidth(root_child2));
   ASSERT_FLOAT_EQ(102, YGNodeLayoutGetHeight(root_child2));
diff --git a/yoga/algorithm/Align.h b/yoga/algorithm/Align.h
index ac4dfcde91..bb21fe5dca 100644
--- a/yoga/algorithm/Align.h
+++ b/yoga/algorithm/Align.h
@@ -37,8 +37,8 @@ constexpr Align fallbackAlignment(Align align) {
     case Align::Stretch:
       return Align::FlexStart;
 
-    // Fallback to safe center. TODO: This should be aligned to Start
-    // instead of FlexStart (for row-reverse containers)
+    // Fallback to safe center. TODO (T208209388): This should be aligned to
+    // Start instead of FlexStart (for row-reverse containers)
     case Align::SpaceAround:
     case Align::SpaceEvenly:
       return Align::FlexStart;
@@ -59,8 +59,8 @@ constexpr Justify fallbackAlignment(Justify align) {
       // case Justify::Stretch:
       return Justify::FlexStart;
 
-    // Fallback to safe center. TODO: This should be aligned to Start
-    // instead of FlexStart (for row-reverse containers)
+    // Fallback to safe center. TODO (T208209388): This should be aligned to
+    // Start instead of FlexStart (for row-reverse containers)
     case Justify::SpaceAround:
     case Justify::SpaceEvenly:
       return Justify::FlexStart;