Merge branch 'main' into chore-tar-update-resolutions

addons/api/mirage/scenarios/default.js

@@ -47,8 +47,9 @@ export default function (server) {
   // Other resources
   server.schema.scopes.where({ type: 'project' }).models.forEach((scope) => {
     server.createList('host-catalog', 2, { scope }, 'withChildren');
-    server.createList('session', 4, { scope }, 'withAssociations');
     server.createList('credential-store', 3, { scope }, 'withAssociations');
     server.createList('target', 2, { scope }, 'withAssociations');
+    // Sessions have target data. Create it after targets.
+    server.createList('session', 4, { scope }, 'withAssociations');
   });
 }