Merge branch 'develop' into cg-JS-1207

packages/nextjs/src/server/index.ts

@@ -1,3 +1,7 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
+import { context } from '@opentelemetry/api';
 import {
   ATTR_HTTP_ROUTE,
   ATTR_URL_QUERY,