Merge remote-tracking branch 'origin/master' into feature/oauth

# Conflicts:
#	src/Web/Endpoints/Users.cs

src/Web/Endpoints/Users.cs

@@ -18,7 +18,7 @@ public class Users : EndpointGroupBase
     {
         return await sender.Send(command);
     }
-    
+
     private static async Task<MinimalUserDto> GetMinimalUser(ISender sender, [AsParameters] GetMinimalUserQuery query)
     {
         return await sender.Send(query);

src/Web/wwwroot/api/specification.json

@@ -251,12 +251,20 @@
           {
             "name": "UserId",
             "in": "query",
-            "required": true,
             "schema": {
               "type": "string",
               "nullable": true
             },
             "x-position": 1
+          },
+          {
+            "name": "UserName",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "nullable": true
+            },
+            "x-position": 2
           }
         ],
         "responses": {