diff --git a/goldens/size-tracking/aio-payloads.json b/goldens/size-tracking/aio-payloads.json
index 9ede9dbe3b..0fd743c3e4 100755
--- a/goldens/size-tracking/aio-payloads.json
+++ b/goldens/size-tracking/aio-payloads.json
@@ -12,8 +12,8 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2987,
-        "main-es2015": 454179,
-        "polyfills-es2015": 52195
+        "main-es2015": 453386,
+        "polyfills-es2015": 52655
       }
     }
   },
diff --git a/goldens/size-tracking/integration-payloads.json b/goldens/size-tracking/integration-payloads.json
index 1be3f61112..b72b53a74c 100644
--- a/goldens/size-tracking/integration-payloads.json
+++ b/goldens/size-tracking/integration-payloads.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 142794,
+        "main-es2015": 143350,
         "polyfills-es2015": 36657
       }
     }
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 148932,
+        "main-es2015": 149471,
         "polyfills-es2015": 36657
       }
     }
@@ -30,7 +30,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 138343,
+        "main-es2015": 138866,
         "polyfills-es2015": 37334
       }
     }
@@ -39,7 +39,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "main-es2015": 247761,
+        "main-es2015": 248455,
         "polyfills-es2015": 36657,
         "5-es2015": 751
       }
@@ -49,7 +49,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "main-es2015": 222907,
+        "main-es2015": 223063,
         "polyfills-es2015": 36657,
         "5-es2015": 779
       }
@@ -60,7 +60,8 @@
       "uncompressed": {
         "bundle": "TODO(i): temporarily increase the payload size limit from 105779 - this is due to a closure issue related to ESM reexports that still needs to be investigated",
         "bundle": "TODO(i): we should define ngDevMode to false in Closure, but --define only works in the global scope.",
-        "bundle": 169991
+        "bundle": "TODO(i): (FW-2164) TS 3.9 new class shape seems to have broken Closure in big ways. The size went from 169991 to 252338",
+        "bundle": 252338
       }
     }
   }
diff --git a/integration/BUILD.bazel b/integration/BUILD.bazel
index a1632842ab..f4fbaef86d 100644
--- a/integration/BUILD.bazel
+++ b/integration/BUILD.bazel
@@ -46,13 +46,14 @@ INTEGRATION_TESTS = {
     "cli-hello-world-ivy-compat": {"commands": "payload_size_tracking"},
     "cli-hello-world-ivy-i18n": {
         "commands": "payload_size_tracking",
-        "tags": ["no-ivy-aot"],
+        # TODO: (FW-2165) cli-hello-world-ivy-i18n fails on a bundle size check with Ivy bundles
+        "tags": ["fixme-ivy-aot"],
     },
     "cli-hello-world-ivy-minimal": {"commands": "payload_size_tracking"},
     "cli-hello-world-lazy": {
         "commands": "payload_size_tracking",
-        # TODO: cli-hello-world-lazy fails on a bundle size check with Ivy bundles
-        "tags": ["no-ivy-aot"],
+        # TODO: (FW-2165) cli-hello-world-lazy fails on a bundle size check with Ivy bundles
+        "tags": ["fixme-ivy-aot"],
     },
     "cli-hello-world-lazy-rollup": {"commands": "payload_size_tracking"},
     "dynamic-compiler": {"tags": ["no-ivy-aot"]},