diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json
index 67b56cd3..ec859982 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json
@@ -299,7 +299,7 @@
               "api_model": {},
               "event_timeout": 60,
               "header_map": {},
-              "id": "649d3621c1da160001f3f2e1",
+              "id": "653a3c6108f9ee00010d68c2",
               "method": "POST",
               "name": "Webhook Receiver Post",
               "org_id": "5e9d9544a1dcd60001d0ed20",
@@ -354,11 +354,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -371,7 +375,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [
     {
@@ -379,7 +384,7 @@
       "event_timeout": 60,
       "hook": {
         "api_model": {},
-        "id": "649d3621c1da160001f3f2e1",
+        "id": "653a3c6108f9ee00010d68c2",
         "org_id": "5e9d9544a1dcd60001d0ed20",
         "name": "Webhook Receiver Post",
         "method": "POST",
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json
index baa0e14a..3113d0ed 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json
@@ -323,11 +323,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -342,7 +346,8 @@
     "analytics_plugin": {},
     "tags": [
       "tyk-gateway-2"
-    ]
+    ],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f575961000181867a.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f575961000181867a.json
index 08ab6a5e..505bf175 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f575961000181867a.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f575961000181867a.json
@@ -647,11 +647,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -666,7 +670,8 @@
     "analytics_plugin": {},
     "tags": [
       "tyk-gateway-2"
-    ]
+    ],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json
index 0d2d366f..d83f657f 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json
@@ -339,11 +339,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -356,7 +360,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867c.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867c.json
index 85834bf1..17874592 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867c.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867c.json
@@ -321,11 +321,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -338,7 +342,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867d.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867d.json
index 55a33e34..26ebeb4b 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867d.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867d.json
@@ -326,11 +326,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -343,7 +347,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead727f5759610001818687.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead727f5759610001818687.json
index df4f2250..9859e31a 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead727f5759610001818687.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead727f5759610001818687.json
@@ -330,11 +330,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -347,7 +351,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5eb6346743f0440001373f5b.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5eb6346743f0440001373f5b.json
index d85b46de..ce3cb4fb 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5eb6346743f0440001373f5b.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5eb6346743f0440001373f5b.json
@@ -426,11 +426,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -443,7 +447,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebcad27bcec140001bca92d.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebcad27bcec140001bca92d.json
index a79f7cdb..35efa7ae 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebcad27bcec140001bca92d.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebcad27bcec140001bca92d.json
@@ -429,11 +429,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -446,7 +450,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebd51f8ad691100014b4c6f.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebd51f8ad691100014b4c6f.json
index 9d705f40..42255e31 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebd51f8ad691100014b4c6f.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ebd51f8ad691100014b4c6f.json
@@ -440,11 +440,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -457,7 +461,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5eed929be9e7a6000127a6d9.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5eed929be9e7a6000127a6d9.json
index 89f9b2d4..9c7cfc70 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5eed929be9e7a6000127a6d9.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5eed929be9e7a6000127a6d9.json
@@ -426,11 +426,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -443,7 +447,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5efa93c4f7502d0001cf4a1a.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5efa93c4f7502d0001cf4a1a.json
index 25030bc8..acef93e6 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5efa93c4f7502d0001cf4a1a.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5efa93c4f7502d0001cf4a1a.json
@@ -434,11 +434,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -454,7 +458,8 @@
     "tags": [
       "cluster1",
       "cluster2"
-    ]
+    ],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f339452522d9f00019d0046.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f339452522d9f00019d0046.json
index ed8743d7..4f5740e6 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f339452522d9f00019d0046.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f339452522d9f00019d0046.json
@@ -426,11 +426,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -443,7 +447,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c7e74cbbf00019db1fd.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c7e74cbbf00019db1fd.json
index a240c4d6..b9f1bbec 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c7e74cbbf00019db1fd.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c7e74cbbf00019db1fd.json
@@ -426,11 +426,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -443,7 +447,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c8c74cbbf00019db1fe.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c8c74cbbf00019db1fe.json
index e73852cd..be1e6673 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c8c74cbbf00019db1fe.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5f535c8c74cbbf00019db1fe.json
@@ -426,11 +426,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -443,7 +447,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5fdacb0281a4960001064139.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5fdacb0281a4960001064139.json
index 1c407d6f..1e9138a8 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-5fdacb0281a4960001064139.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-5fdacb0281a4960001064139.json
@@ -438,11 +438,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -455,7 +459,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-6024c601afd3d900011f60c9.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-6024c601afd3d900011f60c9.json
index f476262e..2bc3eb5e 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-6024c601afd3d900011f60c9.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-6024c601afd3d900011f60c9.json
@@ -438,11 +438,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -455,7 +459,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-609a1bdf8756d10001351aa9.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-609a1bdf8756d10001351aa9.json
index c32f27ed..353b0ba6 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-609a1bdf8756d10001351aa9.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-609a1bdf8756d10001351aa9.json
@@ -440,11 +440,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -457,7 +461,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-60b4968df312ae0001e1ad0d.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-60b4968df312ae0001e1ad0d.json
index 51d8a716..f6546f96 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-60b4968df312ae0001e1ad0d.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-60b4968df312ae0001e1ad0d.json
@@ -446,11 +446,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -464,10 +468,11 @@
     },
     "analytics_plugin": {
       "enable": true,
-      "func_name": "MaskAnalyticsData",
-      "plugin_path": "plugins/go/example/example-go-plugin.so"
+      "plugin_path": "plugins/go/example/example-go-plugin.so",
+      "func_name": "MaskAnalyticsData"
     },
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-60b8d132cd45340001bec761.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-60b8d132cd45340001bec761.json
index b1dfa7ca..27a58c4e 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-60b8d132cd45340001bec761.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-60b8d132cd45340001bec761.json
@@ -469,11 +469,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -487,10 +491,11 @@
     },
     "analytics_plugin": {
       "enable": true,
-      "func_name": "MaskAnalyticsData",
-      "plugin_path": "plugins/go/example/example-go-plugin.so"
+      "plugin_path": "plugins/go/example/example-go-plugin.so",
+      "func_name": "MaskAnalyticsData"
     },
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-60d42ddacf741c00019727d9.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-60d42ddacf741c00019727d9.json
index f445cd9e..85502bca 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-60d42ddacf741c00019727d9.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-60d42ddacf741c00019727d9.json
@@ -446,11 +446,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -463,7 +467,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-610a838a03ca38000122e111.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-610a838a03ca38000122e111.json
index a4230ca8..13e46bb4 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-610a838a03ca38000122e111.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-610a838a03ca38000122e111.json
@@ -438,11 +438,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -455,7 +459,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-615172e48852f00001522ed5.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-615172e48852f00001522ed5.json
index b890ca6b..e04376cc 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-615172e48852f00001522ed5.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-615172e48852f00001522ed5.json
@@ -462,11 +462,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -479,7 +483,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-615175ee8852f00001522ed6.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-615175ee8852f00001522ed6.json
index 0f0a3e71..90b435bf 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-615175ee8852f00001522ed6.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-615175ee8852f00001522ed6.json
@@ -461,11 +461,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -478,7 +482,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-615d2dbd8bf3980001c7c6c1.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-615d2dbd8bf3980001c7c6c1.json
index 6312d26a..76b8b43a 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-615d2dbd8bf3980001c7c6c1.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-615d2dbd8bf3980001c7c6c1.json
@@ -446,11 +446,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -463,7 +467,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-61946f3536dbb90001b7aed5.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-61946f3536dbb90001b7aed5.json
index 8f8de6ee..d0781e7c 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-61946f3536dbb90001b7aed5.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-61946f3536dbb90001b7aed5.json
@@ -488,11 +488,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -505,7 +509,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-619471e736dbb90001b7aed6.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-619471e736dbb90001b7aed6.json
index b0942f9a..03356611 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-619471e736dbb90001b7aed6.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-619471e736dbb90001b7aed6.json
@@ -440,11 +440,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -457,7 +461,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-619472b536dbb90001b7aed7.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-619472b536dbb90001b7aed7.json
index 083566b4..b3411c01 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-619472b536dbb90001b7aed7.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-619472b536dbb90001b7aed7.json
@@ -440,11 +440,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -457,7 +461,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-61c406297333700001d15861.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-61c406297333700001d15861.json
index 8734992b..7a97f911 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-61c406297333700001d15861.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-61c406297333700001d15861.json
@@ -496,11 +496,15 @@
               "default_type_name": "Int"
             }
           }
-        ]
+        ],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -513,7 +517,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-61ca28234d94310001957b4d.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-61ca28234d94310001957b4d.json
index 7d48dfb0..d8ffb7e3 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-61ca28234d94310001957b4d.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-61ca28234d94310001957b4d.json
@@ -446,11 +446,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -463,7 +467,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-61d89590fb3c3800017895ee.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-61d89590fb3c3800017895ee.json
index 96383007..930b447b 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-61d89590fb3c3800017895ee.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-61d89590fb3c3800017895ee.json
@@ -456,11 +456,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -473,7 +477,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-61d895fdfb3c3800017895ef.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-61d895fdfb3c3800017895ef.json
index 1bc97768..8d9ef5a1 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-61d895fdfb3c3800017895ef.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-61d895fdfb3c3800017895ef.json
@@ -523,11 +523,15 @@
               "default_type_name": "User"
             }
           }
-        ]
+        ],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -540,7 +544,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-620e87e0fcade600016df5f9.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-620e87e0fcade600016df5f9.json
index 266c77a0..7eeefa1c 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-620e87e0fcade600016df5f9.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-620e87e0fcade600016df5f9.json
@@ -479,11 +479,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -496,7 +500,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-6225a1b137d93600015a1731.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-6225a1b137d93600015a1731.json
index f00d6125..122cc1e4 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-6225a1b137d93600015a1731.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-6225a1b137d93600015a1731.json
@@ -594,11 +594,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -611,7 +615,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-62a0ec2592faf50001395816.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-62a0ec2592faf50001395816.json
index b729dada..d898669e 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-62a0ec2592faf50001395816.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-62a0ec2592faf50001395816.json
@@ -379,11 +379,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -396,7 +400,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14bf0fffb800010197bc.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14bf0fffb800010197bc.json
index b7b28809..26203fad 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14bf0fffb800010197bc.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14bf0fffb800010197bc.json
@@ -438,11 +438,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -455,7 +459,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14ce0fffb800010197bd.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14ce0fffb800010197bd.json
index 066245f8..a561d7fd 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14ce0fffb800010197bd.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14ce0fffb800010197bd.json
@@ -438,11 +438,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -455,7 +459,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14e80fffb800010197be.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14e80fffb800010197be.json
index c9b5a429..2ed7ee6e 100644
--- a/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14e80fffb800010197be.json
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-641c14e80fffb800010197be.json
@@ -454,11 +454,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -471,7 +475,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-oas-653a2bd7d76db9000141b84b.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-oas-653a2bd7d76db9000141b84b.json
new file mode 100644
index 00000000..e35b7a50
--- /dev/null
+++ b/deployments/tyk/data/tyk-dashboard/1/apis/api-oas-653a2bd7d76db9000141b84b.json
@@ -0,0 +1,50 @@
+{
+  "components": {},
+  "info": {
+    "title": "hmac",
+    "version": "1.0.0"
+  },
+  "openapi": "3.0.3",
+  "paths": {},
+  "servers": [
+    {
+      "url": "http://tyk-gateway.localhost:8080/hmac/"
+    }
+  ],
+  "x-tyk-api-gateway": {
+    "info": {
+      "dbId": "653a2bd7d76db9000141b84b",
+      "id": "cc989c3e1bbb453d65475374d776e2ec",
+      "name": "hmac",
+      "orgId": "5e9d9544a1dcd60001d0ed20",
+      "state": {
+        "active": true
+      }
+    },
+    "server": {
+      "authentication": {
+        "enabled": true,
+        "hmac": {
+          "allowedAlgorithms": [
+            "hmac-sha1",
+            "hmac-sha256"
+          ],
+          "allowedClockSkew": -1,
+          "enabled": true,
+          "header": {
+            "enabled": true,
+            "name": "Authorization"
+          }
+        }
+      },
+      "listenPath": {
+        "strip": true,
+        "value": "/hmac/"
+      },
+      "slug": "hmac"
+    },
+    "upstream": {
+      "url": "http://httpbin"
+    }
+  }
+}
diff --git a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead7120575961000181867f.json b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead7120575961000181867f.json
index 07692e71..421809ef 100644
--- a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead7120575961000181867f.json
+++ b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead7120575961000181867f.json
@@ -1,6 +1,6 @@
 {
   "auth_type": "other",
-  "auth_types": null,
+  "auth_types": [],
   "state": "active",
   "access_rights_array": [],
   "graphql_enabled": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818680.json b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818680.json
index ef6f7faf..2e4a6160 100644
--- a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818680.json
+++ b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818680.json
@@ -1,6 +1,6 @@
 {
   "auth_type": "other",
-  "auth_types": null,
+  "auth_types": [],
   "state": "active",
   "access_rights_array": [],
   "graphql_enabled": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818681.json b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818681.json
index bf08434b..4378ae91 100644
--- a/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818681.json
+++ b/deployments/tyk/data/tyk-dashboard/1/policies/policy-5ead71205759610001818681.json
@@ -1,6 +1,6 @@
 {
   "auth_type": "other",
-  "auth_types": null,
+  "auth_types": [],
   "state": "active",
   "access_rights_array": [],
   "graphql_enabled": false,
diff --git a/deployments/tyk/data/tyk-dashboard/1/policies/policy-641c15dd0fffb800010197bf.json b/deployments/tyk/data/tyk-dashboard/1/policies/policy-641c15dd0fffb800010197bf.json
index cef6da87..187e21f5 100644
--- a/deployments/tyk/data/tyk-dashboard/1/policies/policy-641c15dd0fffb800010197bf.json
+++ b/deployments/tyk/data/tyk-dashboard/1/policies/policy-641c15dd0fffb800010197bf.json
@@ -6,8 +6,8 @@
   "state": "active",
   "access_rights_array": [
     {
-      "api_name": "Rate Limit Path API 2",
-      "api_id": "c252af6eaf2e43ca5c89465af4f481c1",
+      "api_name": "Rate Limit Path API 1",
+      "api_id": "d371b83b249845a2497ab9a947fd6210",
       "versions": [
         "Default"
       ],
@@ -16,8 +16,8 @@
       "allowed_types": [],
       "disable_introspection": false,
       "limit": {
-        "rate": 3,
-        "per": 6,
+        "rate": 1,
+        "per": 5,
         "throttle_interval": -1,
         "throttle_retry_limit": -1,
         "max_query_depth": -1,
@@ -31,8 +31,8 @@
       "allowance_scope": ""
     },
     {
-      "api_name": "Rate Limit Proxy API",
-      "api_id": "d1dfc6a927a046c54c0ed470f19757cc",
+      "api_name": "Rate Limit Path API 2",
+      "api_id": "c252af6eaf2e43ca5c89465af4f481c1",
       "versions": [
         "Default"
       ],
@@ -40,13 +40,24 @@
       "restricted_types": [],
       "allowed_types": [],
       "disable_introspection": false,
-      "limit": null,
+      "limit": {
+        "rate": 3,
+        "per": 6,
+        "throttle_interval": -1,
+        "throttle_retry_limit": -1,
+        "max_query_depth": -1,
+        "quota_max": -1,
+        "quota_renews": 0,
+        "quota_remaining": 0,
+        "quota_renewal_rate": -1,
+        "set_by_policy": false
+      },
       "field_access_rights": [],
       "allowance_scope": ""
     },
     {
-      "api_name": "Rate Limit Path API 1",
-      "api_id": "d371b83b249845a2497ab9a947fd6210",
+      "api_name": "Rate Limit Proxy API",
+      "api_id": "d1dfc6a927a046c54c0ed470f19757cc",
       "versions": [
         "Default"
       ],
@@ -54,18 +65,7 @@
       "restricted_types": [],
       "allowed_types": [],
       "disable_introspection": false,
-      "limit": {
-        "rate": 1,
-        "per": 5,
-        "throttle_interval": -1,
-        "throttle_retry_limit": -1,
-        "max_query_depth": -1,
-        "quota_max": -1,
-        "quota_renews": 0,
-        "quota_remaining": 0,
-        "quota_renewal_rate": -1,
-        "set_by_policy": false
-      },
+      "limit": null,
       "field_access_rights": [],
       "allowance_scope": ""
     }
diff --git a/deployments/tyk/data/tyk-dashboard/1/policies/policy-653a3eef08f9ee0001e1b271.json b/deployments/tyk/data/tyk-dashboard/1/policies/policy-653a3eef08f9ee0001e1b271.json
new file mode 100644
index 00000000..7ac201d3
--- /dev/null
+++ b/deployments/tyk/data/tyk-dashboard/1/policies/policy-653a3eef08f9ee0001e1b271.json
@@ -0,0 +1,66 @@
+{
+  "auth_type": "hmac",
+  "auth_types": [
+    "hmac"
+  ],
+  "state": "active",
+  "access_rights_array": [
+    {
+      "api_name": "hmac",
+      "api_id": "cc989c3e1bbb453d65475374d776e2ec",
+      "versions": [
+        ""
+      ],
+      "allowed_urls": [],
+      "restricted_types": [],
+      "allowed_types": [],
+      "disable_introspection": false,
+      "limit": null,
+      "field_access_rights": [],
+      "allowance_scope": ""
+    }
+  ],
+  "graphql_enabled": false,
+  "_id": "653a3eef08f9ee0001e1b271",
+  "id": "",
+  "name": "HMAC Policy",
+  "org_id": "5e9d9544a1dcd60001d0ed20",
+  "rate": 1000,
+  "per": 60,
+  "quota_max": -1,
+  "quota_renewal_rate": -1,
+  "throttle_interval": -1,
+  "throttle_retry_limit": -1,
+  "max_query_depth": -1,
+  "access_rights": {
+    "cc989c3e1bbb453d65475374d776e2ec": {
+      "api_name": "hmac",
+      "api_id": "cc989c3e1bbb453d65475374d776e2ec",
+      "versions": [
+        ""
+      ],
+      "allowed_urls": [],
+      "restricted_types": [],
+      "allowed_types": [],
+      "disable_introspection": false,
+      "limit": null,
+      "field_access_rights": [],
+      "allowance_scope": ""
+    }
+  },
+  "hmac_enabled": true,
+  "active": true,
+  "is_inactive": false,
+  "date_created": "2023-10-26T10:26:55.256Z",
+  "tags": [],
+  "key_expires_in": 0,
+  "partitions": {
+    "quota": true,
+    "rate_limit": true,
+    "complexity": false,
+    "acl": true,
+    "per_api": false
+  },
+  "last_updated": "1698316015",
+  "meta_data": {}
+}
diff --git a/deployments/tyk/data/tyk-dashboard/2/apis/api-5f51f0991339530001ad60a1.json b/deployments/tyk/data/tyk-dashboard/2/apis/api-5f51f0991339530001ad60a1.json
index 275280f5..26b6ae94 100644
--- a/deployments/tyk/data/tyk-dashboard/2/apis/api-5f51f0991339530001ad60a1.json
+++ b/deployments/tyk/data/tyk-dashboard/2/apis/api-5f51f0991339530001ad60a1.json
@@ -433,11 +433,15 @@
       },
       "engine": {
         "field_configs": [],
-        "data_sources": []
+        "data_sources": [],
+        "global_headers": []
       },
       "proxy": {
         "auth_headers": {},
-        "request_headers": {}
+        "request_headers": {},
+        "use_response_extensions": {
+          "on_error_forwarding": false
+        }
       },
       "subgraph": {
         "sdl": ""
@@ -450,7 +454,8 @@
       }
     },
     "analytics_plugin": {},
-    "tags": []
+    "tags": [],
+    "detailed_tracing": false
   },
   "hook_references": [],
   "is_site": false,
diff --git a/deployments/tyk/data/tyk-gateway/keys/bearer-token/bearer-token-9-hmac.json b/deployments/tyk/data/tyk-gateway/keys/bearer-token/bearer-token-9-hmac.json
new file mode 100644
index 00000000..28ab7b08
--- /dev/null
+++ b/deployments/tyk/data/tyk-gateway/keys/bearer-token/bearer-token-9-hmac.json
@@ -0,0 +1,8 @@
+{
+  "apply_policies": [
+    "653a3eef08f9ee0001e1b271"
+  ],
+  "hmac_enabled": true,
+  "hmac_string": "MmY2MGE0YmVhNWY2NGQ5NmEzZmUxN2YzZTQ5MTBjNzA=",
+  "org_id": "5e9d9544a1dcd60001d0ed20"
+}
diff --git a/scripts/common.sh b/scripts/common.sh
index 1ccdb23a..1108b7d7 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -544,7 +544,6 @@ create_api () {
   api_response=""
   if [ "$api_is_oas" == true ]; then
     # OAS API
-    # we just create OAS APIs, rather than import them, as the import endpoint doesn't allow for the id to be maintained, so it makes no difference
     api_response="$(curl $dashboard_base_url/api/apis/oas -s \
       -H "authorization: $dashboard_api_key" \
       -d "$api_data" 2>> logs/bootstrap.log)"