Merge remote-tracking branch 'origin/main' into DSC-287-Show-an-error-page-if-the-REST-API-is-not-available

# Conflicts:
#	src/app/app-routing.module.ts

src/app/app-routing.module.ts

@@ -216,7 +216,8 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
       }
     ], {
       onSameUrlNavigation: 'reload',
-    })
+    relativeLinkResolution: 'legacy'
+})
   ],
   exports: [RouterModule],
 })