diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
index e615be5ecb..364bb76c1f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
@@ -16,11 +16,14 @@ public class AbpAspNetCoreMvcOptions
 
     public bool EnableRazorRuntimeCompilationOnDevelopment { get; set; }
 
+    public bool ChangeControllerModelApiExplorerGroupName { get; set; }
+
     public AbpAspNetCoreMvcOptions()
     {
         ConventionalControllers = new AbpConventionalControllerOptions();
         IgnoredControllersOnModelExclusion = new HashSet<Type>();
         AutoModelValidation = true;
         EnableRazorRuntimeCompilationOnDevelopment = true;
+        ChangeControllerModelApiExplorerGroupName = true;
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
index e96ae0df37..9a78479b9c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
@@ -207,7 +207,7 @@ public class AbpServiceConvention : IAbpServiceConvention, ITransientDependency
 
     protected virtual void ConfigureApiExplorer(ControllerModel controller)
     {
-        if (controller.ApiExplorer.GroupName.IsNullOrEmpty())
+        if (Options.ChangeControllerModelApiExplorerGroupName && controller.ApiExplorer.GroupName.IsNullOrEmpty())
         {
             controller.ApiExplorer.GroupName = controller.ControllerName;
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Versioning/HttpContextRequestedApiVersion.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Versioning/HttpContextRequestedApiVersion.cs
index c6537ac98d..09db4c3ce2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Versioning/HttpContextRequestedApiVersion.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Versioning/HttpContextRequestedApiVersion.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning;
 
 public class HttpContextRequestedApiVersion : IRequestedApiVersion
 {
-    public string Current => _httpContextAccessor.HttpContext?.GetRequestedApiVersion().ToString();
+    public string Current => _httpContextAccessor.HttpContext?.GetRequestedApiVersion()?.ToString();
 
     private readonly IHttpContextAccessor _httpContextAccessor;
 
diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
index 2cbe02c95e..9650377580 100644
--- a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
+++ b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs
@@ -170,7 +170,7 @@ public class AbpHttpClientProxyServiceConvention : AbpServiceConvention
     {
         if (ControllerWithAttributeRoute.Contains(controller))
         {
-            if (controller.ApiExplorer.GroupName.IsNullOrEmpty())
+            if (Options.ChangeControllerModelApiExplorerGroupName && controller.ApiExplorer.GroupName.IsNullOrEmpty())
             {
                 controller.ApiExplorer.GroupName = controller.ControllerName;
             }
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
index 85c4848f02..b24b7a6b5d 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ClientProxyBase.cs
@@ -38,6 +38,7 @@ public class ClientProxyBase<TService> : ITransientDependency
     protected IRemoteServiceHttpClientAuthenticator ClientAuthenticator => LazyServiceProvider.LazyGetRequiredService<IRemoteServiceHttpClientAuthenticator>();
     protected ClientProxyRequestPayloadBuilder ClientProxyRequestPayloadBuilder => LazyServiceProvider.LazyGetRequiredService<ClientProxyRequestPayloadBuilder>();
     protected ClientProxyUrlBuilder ClientProxyUrlBuilder => LazyServiceProvider.LazyGetRequiredService<ClientProxyUrlBuilder>();
+    protected ICurrentApiVersionInfo CurrentApiVersionInfo => LazyServiceProvider.LazyGetRequiredService<ICurrentApiVersionInfo>();
 
     protected virtual async Task RequestAsync(string methodName, ClientProxyRequestTypeValue arguments = null)
     {
@@ -156,6 +157,11 @@ public class ClientProxyBase<TService> : ITransientDependency
 
     protected virtual async Task<ApiVersionInfo> GetApiVersionInfoAsync(ClientProxyRequestContext requestContext)
     {
+        if (CurrentApiVersionInfo.ApiVersionInfo != null)
+        {
+            return CurrentApiVersionInfo.ApiVersionInfo;
+        }
+
         var apiVersion = await FindBestApiVersionAsync(requestContext);
 
         //TODO: Make names configurable?
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/CurrentApiVersionInfo.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/CurrentApiVersionInfo.cs
new file mode 100644
index 0000000000..d2040e692c
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/CurrentApiVersionInfo.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Threading;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Http.Client.ClientProxying;
+
+public class CurrentApiVersionInfo : ICurrentApiVersionInfo, ITransientDependency
+{
+    public ApiVersionInfo ApiVersionInfo => _currentPrincipal.Value;
+
+    private readonly AsyncLocal<ApiVersionInfo> _currentPrincipal = new AsyncLocal<ApiVersionInfo>();
+
+    public virtual IDisposable Change(ApiVersionInfo apiVersionInfo)
+    {
+        var parent = ApiVersionInfo;
+        _currentPrincipal.Value = apiVersionInfo;
+        return new DisposeAction(() =>
+        {
+            _currentPrincipal.Value = parent;
+        });
+    }
+}
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ICurrentApiVersionInfo.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ICurrentApiVersionInfo.cs
new file mode 100644
index 0000000000..9a8fe264bf
--- /dev/null
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ICurrentApiVersionInfo.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Volo.Abp.Http.Client.ClientProxying;
+
+public interface ICurrentApiVersionInfo
+{
+    ApiVersionInfo ApiVersionInfo { get; }
+
+    IDisposable Change(ApiVersionInfo apiVersionInfo);
+}