diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d567d66..16863ae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.6.3 (07 September 2024)
+- [#1165](https://github.com/WireMock-Net/WireMock.Net/pull/1165) - Fix listen on AnyIP for url 0.0.0.0 contributed by [cocoon](https://github.com/cocoon)
+- [#1154](https://github.com/WireMock-Net/WireMock.Net/issues/1154) - Listen on all ips [bug]
+
 # 1.6.2 (04 September 2024)
 - [#1152](https://github.com/WireMock-Net/WireMock.Net/pull/1152) - Update MappingConverter to correctly write the Matcher as C# code [bug] contributed by [StefH](https://github.com/StefH)
 - [#1163](https://github.com/WireMock-Net/WireMock.Net/pull/1163) - Upgrade Aspire to version 8.2.0 [feature] contributed by [StefH](https://github.com/StefH)
diff --git a/Directory.Build.props b/Directory.Build.props
index a4244435..fcd7d4ce 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.6.2</VersionPrefix>
+        <VersionPrefix>1.6.3</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -44,15 +44,15 @@
     </Choose>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <!--<PackageReference Include="SonarAnalyzer.CSharp" Version="9.29.0.95321">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
+        </PackageReference>
         <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd
index 8bce4728..5bcb8bbe 100644
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.6.2
+SET version=1.6.3
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 
diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt
index 1e9868e8..62f89117 100644
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,8 +1,5 @@
-# 1.6.2 (04 September 2024)
-- #1152 Update MappingConverter to correctly write the Matcher as C# code [bug]
-- #1163 Upgrade Aspire to version 8.2.0 [feature]
-- #1166 Also update IWireMockMiddlewareOptions when settings are updated via admin interface [bug]
-- #1151 MappingsToCSharpCode should use RegexMatcher when specified [bug]
-- #1164 WithParam not working. [bug]
+# 1.6.3 (07 September 2024)
+- #1165 Fix listen on AnyIP for url 0.0.0.0
+- #1154 Listen on all ips [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 04d2a921..df1f66b1 100644
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 
 | | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
-| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
-| &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/nuget/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/myget/wiremock-net/WireMock.Net.FluentAssertions?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
-| &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/nuget/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/myget/wiremock-net/WireMock.Net.Matchers.CSharpCode?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
-| &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
-| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
-| &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
-| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
-| &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://buildstats.info/nuget/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://buildstats.info/myget/wiremock-net/WireMock.Net.Aspire?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
-| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
+| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
+| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.StandAlone?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
+| &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/nuget/v/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.FluentAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
+| &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
+| &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
+| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
+| &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://img.shields.io/nuget/v/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Testcontainers?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
+| &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://img.shields.io/nuget/v/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Aspire?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
+| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
 
 
 ## :memo: Development
diff --git a/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs b/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
new file mode 100644
index 00000000..eabfce47
--- /dev/null
+++ b/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
@@ -0,0 +1,25 @@
+// Copyright © WireMock.Net
+
+using WireMock.Types;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Util;
+
+// ReSharper disable once InconsistentNaming
+public static class IBodyDataExtensions
+{
+    public static BodyType GetBodyType(this IBodyData bodyData)
+    {
+        if (bodyData.DetectedBodyTypeFromContentType is not null and not BodyType.None)
+        {
+            return bodyData.DetectedBodyTypeFromContentType.Value;
+        }
+
+        if (bodyData.DetectedBodyType is not null and not BodyType.None)
+        {
+            return bodyData.DetectedBodyType.Value;
+        }
+
+        return BodyType.None;
+    }
+}
\ No newline at end of file
diff --git a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
index 4cd59a08..2f412e6b 100644
--- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
+++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="CS-Script" Version="4.8.13" />
+    <PackageReference Include="CS-Script" Version="4.8.17" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
index a23b5095..ca55a717 100644
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -28,7 +28,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="[3.9.0]" />
+        <PackageReference Include="Testcontainers" Version="3.10.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
index 23619bef..a43a6528 100644
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -9,6 +9,7 @@
 using Stef.Validation;
 using WireMock.Constants;
 using WireMock.Types;
+using WireMock.Util;
 
 namespace WireMock.Http;
 
@@ -33,12 +34,14 @@ internal static HttpRequestMessage Create(IRequestMessage requestMessage, string
             MediaTypeHeaderValue.TryParse(value, out contentType);
         }
 
-        httpRequestMessage.Content = requestMessage.BodyData?.DetectedBodyType switch
+        var bodyData = requestMessage.BodyData;
+        httpRequestMessage.Content = bodyData?.GetBodyType() switch
         {
-            BodyType.Bytes => ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes!, contentType),
-            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType),
-            BodyType.String => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
-            BodyType.FormUrlEncoded => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
+            BodyType.Bytes => ByteArrayContentHelper.Create(bodyData!.BodyAsBytes!, contentType),
+            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(bodyData!.BodyAsJson), contentType),
+            BodyType.String => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
+            BodyType.FormUrlEncoded => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
+
             _ => httpRequestMessage.Content
         };
 
diff --git a/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs b/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
index 26536ece..0cbbed20 100644
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
@@ -75,8 +75,15 @@ private static void SetHttpsAndUrls(KestrelServerOptions kestrelOptions, IWireMo
 
         private static void Listen(KestrelServerOptions kestrelOptions, HostUrlDetails urlDetail, Action<ListenOptions> configure)
         {
+            // Listens on any IP with the given port.
+            if (urlDetail is { Port: > 0, Host: "0.0.0.0" })
+            {
+                kestrelOptions.ListenAnyIP(urlDetail.Port, configure);
+                return;
+            }
+            
             // Listens on ::1 and 127.0.0.1 with the given port.
-            if (urlDetail is { Port: > 0, Host: "localhost" or "127.0.0.1" or "0.0.0.0" or "::1" })
+            if (urlDetail is { Port: > 0, Host: "localhost" or "127.0.0.1" or "::1" })
             {
                 kestrelOptions.ListenLocalhost(urlDetail.Port, configure);
                 return;
@@ -113,4 +120,4 @@ internal static IWebHostBuilder ConfigureKestrelServerOptions(this IWebHostBuild
         }
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
index b48f0fc2..85700942 100644
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -136,30 +136,37 @@ private bool IsFault(IResponseMessage responseMessage)
             return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
         }
 
-        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
-        {
-            switch (responseMessage.BodyData?.DetectedBodyType)
+        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage) {
+            var bodyData = responseMessage.BodyData;
+            switch (bodyData?.GetBodyType())
             {
                 case BodyType.String:
                 case BodyType.FormUrlEncoded:
-                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString!);
+                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(bodyData.BodyAsString!);
 
                 case BodyType.Json:
-                    var formatting = responseMessage.BodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
-                    var jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
-                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
+                    var formatting = bodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
+                    var jsonBody = JsonConvert.SerializeObject(bodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
+                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
 
 #if PROTOBUF
                 case BodyType.ProtoBuf:
-                    var protoDefinitions = responseMessage.BodyData.ProtoDefinition?.Invoke().Texts;
+                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
                     return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson).ConfigureAwait(false);
 #endif
 
                 case BodyType.Bytes:
-                    return responseMessage.BodyData.BodyAsBytes;
+                    return bodyData.BodyAsBytes;
 
                 case BodyType.File:
-                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile!);
+                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(bodyData.BodyAsFile!);
+
+                case BodyType.MultiPart:
+                    _options.Logger.Warn("MultiPart body type is not handled!");
+                    break;
+
+                case BodyType.None:
+                    break;
             }
 
             return null;
@@ -171,10 +178,7 @@ private static void SetResponseHeaders(IResponseMessage responseMessage, byte[]?
             AppendResponseHeader(
                 response,
                 HttpKnownHeaderNames.Date,
-                new[]
-                {
-                    DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)
-                }
+                [ DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture) ]
             );
 
             // Set other headers
diff --git a/src/WireMock.Net/Server/WireMockServer.Admin.cs b/src/WireMock.Net/Server/WireMockServer.Admin.cs
index 7ffe78e9..a7cf33ca 100644
--- a/src/WireMock.Net/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -623,7 +623,7 @@ private IResponseMessage RequestsFind(IRequestMessage requestMessage)
     {
         var requestModel = DeserializeObject<RequestModel>(requestMessage);
 
-        var request = (Request)InitRequestBuilder(requestModel, false)!;
+        var request = (Request)InitRequestBuilder(requestModel);
 
         var dict = new Dictionary<ILogEntry, RequestMatchResult>();
         foreach (var logEntry in LogEntries.Where(le => !le.RequestMessage.Path.StartsWith("/__admin/")))
diff --git a/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs b/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs
index 10c042dd..c3fa6dff 100644
--- a/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs
@@ -36,17 +36,13 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
         }
     }
 
-    private Guid? ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
+    private Guid ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
     {
         Guard.NotNull(mappingModel);
         Guard.NotNull(mappingModel.Request);
         Guard.NotNull(mappingModel.Response);
 
-        var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
-        if (requestBuilder == null)
-        {
-            return null;
-        }
+        var requestBuilder = InitRequestBuilder(mappingModel.Request);
 
         var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);
 
@@ -126,9 +122,9 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
         return respondProvider.Guid;
     }
 
-    private IRequestBuilder? InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
+    private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
     {
-        IRequestBuilder requestBuilder = Request.Create();
+        var requestBuilder = Request.Create();
 
         if (requestModel.ClientIP != null)
         {
@@ -146,13 +142,11 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
             }
         }
 
-        bool pathOrUrlMatchersValid = false;
         if (requestModel.Path != null)
         {
             if (requestModel.Path is string path)
             {
                 requestBuilder = requestBuilder.WithPath(path);
-                pathOrUrlMatchersValid = true;
             }
             else
             {
@@ -161,7 +155,6 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
                 {
                     var matchOperator = StringUtils.ParseMatchOperator(pathModel.MatchOperator);
                     requestBuilder = requestBuilder.WithPath(matchOperator, pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
                 }
             }
         }
@@ -170,7 +163,6 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
             if (requestModel.Url is string url)
             {
                 requestBuilder = requestBuilder.WithUrl(url);
-                pathOrUrlMatchersValid = true;
             }
             else
             {
@@ -179,17 +171,10 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
                 {
                     var matchOperator = StringUtils.ParseMatchOperator(urlModel.MatchOperator);
                     requestBuilder = requestBuilder.WithUrl(matchOperator, urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
                 }
             }
         }
 
-        if (pathOrUrlRequired && !pathOrUrlMatchersValid)
-        {
-            _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
-            return null;
-        }
-
         if (requestModel.Methods != null)
         {
             var matchBehaviour = requestModel.MethodsRejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
@@ -233,7 +218,7 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
         {
             foreach (var paramModel in requestModel.Params.Where(p => p is { Matchers: { } }))
             {
-                bool ignoreCase = paramModel.IgnoreCase == true;
+                var ignoreCase = paramModel.IgnoreCase == true;
                 requestBuilder = requestBuilder.WithParam(paramModel.Name, ignoreCase, paramModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
             }
         }
@@ -253,7 +238,7 @@ private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingMo
 
     private static IResponseBuilder InitResponseBuilder(ResponseModel responseModel)
     {
-        IResponseBuilder responseBuilder = Response.Create();
+        var responseBuilder = Response.Create();
 
         if (responseModel.Delay > 0)
         {
diff --git a/test/WireMock.Net.Aspire.Tests/DockerUtils.cs b/test/WireMock.Net.Aspire.Tests/DockerUtils.cs
index fa7b6378..2528dbcd 100644
--- a/test/WireMock.Net.Aspire.Tests/DockerUtils.cs
+++ b/test/WireMock.Net.Aspire.Tests/DockerUtils.cs
@@ -8,10 +8,7 @@ namespace WireMock.Net.Aspire.Tests;
 [ExcludeFromCodeCoverage]
 internal static class DockerUtils
 {
-    public static bool IsDockerRunningLinuxContainerMode()
-    {
-        return IsDockerRunning() && IsLinuxContainerMode();
-    }
+    public static Lazy<bool> IsDockerRunningLinuxContainerMode => new(() => IsDockerRunning() && IsLinuxContainerMode());
 
     private static bool IsDockerRunning()
     {
diff --git a/test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs b/test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs
new file mode 100644
index 00000000..7be0668d
--- /dev/null
+++ b/test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs
@@ -0,0 +1,16 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Aspire.Tests.Facts;
+
+public sealed class DockerIsRunningInLinuxContainerModeFact : FactAttribute
+{
+    private const string SkipReason = "Docker is not running in Linux container mode. Skipping test.";
+
+    public DockerIsRunningInLinuxContainerModeFact()
+    {
+        if (!DockerUtils.IsDockerRunningLinuxContainerMode.Value)
+        {
+            Skip = SkipReason;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
index 8f78430b..e51c2d9b 100644
--- a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
@@ -3,6 +3,7 @@
 using System.Net.Http.Json;
 using FluentAssertions;
 using Projects;
+using WireMock.Net.Aspire.Tests.Facts;
 using Xunit.Abstractions;
 
 namespace WireMock.Net.Aspire.Tests;
@@ -11,15 +12,9 @@ public class IntegrationTests(ITestOutputHelper output)
 {
     private record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);
 
-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeatherForecastEndpoint()
     {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
         // Arrange
         var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
         await using var app = await appHostBuilder.BuildAsync();
@@ -44,15 +39,9 @@ public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeat
         weatherForecasts2.Should().HaveCount(5);
     }
 
-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateWireMockAdminClientToCallTheAdminEndpoint()
     {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
         // Arrange
         var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
         await using var app = await appHostBuilder.BuildAsync();
diff --git a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs
new file mode 100644
index 00000000..f8f70818
--- /dev/null
+++ b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs
@@ -0,0 +1,22 @@
+// Copyright © WireMock.Net
+
+using System;
+using Xunit;
+
+namespace WireMock.Net.Tests.Facts;
+
+public sealed class IgnoreOnContinuousIntegrationFact : FactAttribute
+{
+    private const string SkipReason = "Ignore when run via CI/CD";
+    private static readonly bool IsContinuousIntegrationAzure = bool.TryParse(Environment.GetEnvironmentVariable("TF_BUILD"), out var isTF) && isTF;
+    private static readonly bool IsContinuousIntegrationGithub = bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out var isGH) && isGH;
+    private static readonly bool IsContinuousIntegration = IsContinuousIntegrationAzure || IsContinuousIntegrationGithub;
+
+    public IgnoreOnContinuousIntegrationFact()
+    {
+        if (IsContinuousIntegration)
+        {
+            Skip = SkipReason;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
index b356e40f..edd22b2b 100644
--- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
+++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
@@ -49,6 +49,26 @@ public async Task HttpRequestMessageHelper_Create_Bytes()
         Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
     }
 
+    [Fact]
+    public async Task HttpRequestMessageHelper_Create_TextPlain()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = "0123", // or 83 in decimal
+            BodyAsJson = 83,
+            DetectedBodyType = BodyType.Json,
+            DetectedBodyTypeFromContentType = BodyType.String
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
+
+        // Act
+        var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+        // Assert
+        Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("0123");
+    }
+
     [Fact]
     public async Task HttpRequestMessageHelper_Create_Json()
     {
@@ -64,7 +84,7 @@ public async Task HttpRequestMessageHelper_Create_Json()
         var message = HttpRequestMessageHelper.Create(request, "http://url");
 
         // Assert
-        Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
+        Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
     }
 
     [Fact]
diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs
new file mode 100644
index 00000000..c46d1da4
--- /dev/null
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs
@@ -0,0 +1,111 @@
+// Copyright © WireMock.Net
+
+#if NET8_0_OR_GREATER
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using WireMock.Net.Xunit;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace WireMock.Net.Tests.ResponseBuilders;
+
+public sealed class ResponseWithProxyIntegrationTests(ITestOutputHelper output)
+{
+    [Fact]
+    public async Task Response_UsingTextPlain()
+    {
+        // Given
+        using var server = await TestServer.New().Run();
+        var port = server.GetPort();
+        output.WriteLine($"Server running on port {port}");
+
+        var settings = new WireMockServerSettings
+        {
+            Port = 0,
+            Logger = new TestOutputHelperWireMockLogger(output)
+        };
+        using var mockServer = WireMockServer.Start(settings);
+        mockServer.Given(Request.Create().WithPath("/zipcode").UsingPatch())
+                  .RespondWith(Response.Create().WithProxy($"http://localhost:{port}"));
+
+        using var client = new HttpClient { BaseAddress = new Uri(mockServer.Urls[0]) };
+        using var content = new ByteArrayContent("0123"u8.ToArray());
+        content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+
+        // When
+        var response = await client.PatchAsync("/zipcode", content);
+
+        // Then
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        response.Content.Headers.GetValues("Content-Type").Should().BeEquivalentTo("text/plain; charset=utf-8");
+        var result = await response.Content.ReadAsStringAsync();
+        result.Should().Be("0123");
+    }
+
+    sealed class Disposable(Action dispose) : IDisposable
+    {
+        public void Dispose() => dispose();
+    }
+
+    sealed class TestServer(WebApplication app) : IDisposable
+    {
+        private Disposable _disposable = new(() => { });
+
+        public static TestServer New()
+        {
+            var builder = WebApplication.CreateBuilder();
+            builder.WebHost.ConfigureKestrel(opts => opts.ListenAnyIP(0));
+
+            var app = builder.Build();
+
+            app.MapPatch("/zipcode", async (HttpRequest req) =>
+            {
+                var memory = new MemoryStream();
+                await req.Body.CopyToAsync(memory);
+                var content = Encoding.UTF8.GetString(memory.ToArray());
+                return content;
+            });
+            return new(app);
+        }
+
+        public int GetPort()
+            => app.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>()!.Addresses
+                  .Select(x => new Uri(x).Port)
+                  .First();
+
+        public async ValueTask<TestServer> Run()
+        {
+            var started = new TaskCompletionSource();
+            var host = app.Services.GetRequiredService<IHostApplicationLifetime>();
+            host.ApplicationStarted.Register(() => started.SetResult());
+            _ = Task.Run(() => app.RunAsync());
+            await started.Task;
+            _disposable = new(() => host.StopApplication());
+            return this;
+        }
+
+        public void Dispose()
+        {
+            _disposable.Dispose();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs
index 2e80e1b9..b1a919ef 100644
--- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs
+++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs
@@ -11,9 +11,11 @@
 using Moq;
 using Newtonsoft.Json;
 using NFluent;
-using WireMock.Admin.Settings;
+using RestEase;
+using WireMock.Client;
 using WireMock.Handlers;
 using WireMock.Logging;
+using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -244,6 +246,38 @@ public void WireMockServer_Admin_ReadStaticMappings_FolderDoesNotExist()
         loggerMock.Verify(l => l.Info(It.Is<string>(s => s.StartsWith("The Static Mapping folder")), It.IsAny<object[]>()), Times.Once);
     }
 
+    [Fact]
+    public async Task WireMockServer_Admin_Mapping_WithoutPathOrUrl()
+    {
+        // Arrange
+        using var server = WireMockServer.StartWithAdminInterface();
+
+        // Act
+        server.Given(Request.Create().UsingGet())
+            .RespondWith(Response.Create());
+
+        // Assert
+        var mapping = server.Mappings.First(m => !m.IsAdminInterface);
+        var request = (Request) mapping.RequestMatcher;
+        var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
+        pathMatcher.Should().BeNull();
+
+        var api = RestClient.For<IWireMockAdminApi>(server.Url);
+        var mappingModels = await api.GetMappingsAsync();
+        var mappingModel = mappingModels.First();
+        mappingModel.Request.Path.Should().BeNull();
+        mappingModel.Request.Url.Should().BeNull();
+
+        await api.DeleteMappingsAsync();
+
+        await api.PostMappingAsync(mappingModel);
+        await api.GetMappingsAsync();
+        mappingModels = await api.GetMappingsAsync();
+        mappingModel = mappingModels.First();
+        mappingModel.Request.Path.Should().BeNull();
+        mappingModel.Request.Url.Should().BeNull();
+    }
+
     [Fact]
     public void WireMockServer_Admin_Mappings_WithGuid_Get()
     {
diff --git a/test/WireMock.Net.Tests/WireMockServerTests.cs b/test/WireMock.Net.Tests/WireMockServerTests.cs
index c53a7aa3..909ff660 100644
--- a/test/WireMock.Net.Tests/WireMockServerTests.cs
+++ b/test/WireMock.Net.Tests/WireMockServerTests.cs
@@ -8,6 +8,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -16,6 +18,7 @@
 using WireMock.Admin.Mappings;
 using WireMock.Http;
 using WireMock.Matchers;
+using WireMock.Net.Tests.Facts;
 using WireMock.Net.Tests.Serialization;
 using WireMock.Net.Xunit;
 using WireMock.RequestBuilders;
@@ -196,6 +199,66 @@ public async Task WireMockServer_When_HttpClientWithWebProxyCallsHttp_Should_Wor
     }
 #endif
 
+#if NET6_0_OR_GREATER
+    private static string[] GetIPAddressesByFamily(AddressFamily addressFamily)
+    {
+        return NetworkInterface.GetAllNetworkInterfaces()
+            .Where(ni => ni.OperationalStatus == OperationalStatus.Up)
+            .SelectMany(ni => ni.GetIPProperties().UnicastAddresses)
+            .Where(addr => addr.Address.AddressFamily == addressFamily)
+            .Select(addr => addr.Address.ToString())
+            .ToArray();
+    }
+
+    [IgnoreOnContinuousIntegrationFact]
+    public async Task WireMockServer_WithUrl0000_Should_Listen_On_All_IPs_IPv4()
+    {
+        // Arrange
+        var port = PortUtils.FindFreeTcpPort();
+        var IPv4 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetwork);
+        var settings = new WireMockServerSettings
+        {
+            Urls = ["http://0.0.0.0:" + port],
+        };
+        using var server = WireMockServer.Start(settings);
+
+        server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+        foreach (var address in IPv4)
+        {
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://" + address + ":" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Assert
+            response.Should().Be("x");
+        }
+    }
+
+    [IgnoreOnContinuousIntegrationFact]
+    public async Task WireMockServer_WithUrl0000_Should_Listen_On_All_IPs_IPv6()
+    {
+        // Arrange
+        var port = PortUtils.FindFreeTcpPort();
+        var IPv6 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetworkV6);
+        var settings = new WireMockServerSettings
+        {
+            Urls = ["http://0.0.0.0:" + port],
+        };
+        using var server = WireMockServer.Start(settings);
+
+        server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+        foreach (var address in IPv6)
+        {
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://[" + address + "]:" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Assert
+            response.Should().Be("x");
+        }
+    }
+#endif
+
     [Fact]
     public async Task WireMockServer_Should_respond_a_redirect_without_body()
     {
@@ -248,7 +311,7 @@ public async Task WireMockServer_WithCorsPolicyOptions_Should_Work_Correct()
         // Act
         var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
 
-        // Asser.
+        // Assert
         response.Should().Be("x");
 
         server.Stop();
@@ -274,7 +337,7 @@ public async Task WireMockServer_Should_delay_responses_for_a_given_route()
         await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
         watch.Stop();
 
-        // Asser.
+        // Assert
         watch.ElapsedMilliseconds.Should().BeGreaterOrEqualTo(0);
 
         server.Stop();
@@ -662,4 +725,4 @@ public async Task WireMockServer_Using_JsonMapping_And_CustomMatcher_WithIncorre
         server.Stop();
     }
 #endif
-}
\ No newline at end of file
+}