diff --git a/projects/RabbitMQ.Client/client/api/IAutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/api/IAutorecoveringConnection.cs
deleted file mode 100644
index 6b8ed65b18..0000000000
--- a/projects/RabbitMQ.Client/client/api/IAutorecoveringConnection.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This source code is dual-licensed under the Apache License, version
-// 2.0, and the Mozilla Public License, version 2.0.
-//
-// The APL v2.0:
-//
-//---------------------------------------------------------------------------
-//   Copyright (c) 2007-2020 VMware, Inc.
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       https://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//---------------------------------------------------------------------------
-//
-// The MPL v2.0:
-//
-//---------------------------------------------------------------------------
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-//
-//  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
-//---------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-
-using RabbitMQ.Client.Events;
-using RabbitMQ.Client.Exceptions;
-
-namespace RabbitMQ.Client
-{
-    /// <summary>
-    /// Interface to an auto-recovering AMQP connection.
-    /// </summary>
-    public interface IAutorecoveringConnection : IConnection
-    {
-        event EventHandler<EventArgs> RecoverySucceeded;
-        event EventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError;
-
-        event EventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery;
-        event EventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangeAfterRecovery;
-    }
-}
diff --git a/projects/RabbitMQ.Client/client/api/IConnection.cs b/projects/RabbitMQ.Client/client/api/IConnection.cs
index 22b56bf1fb..5da59a801f 100644
--- a/projects/RabbitMQ.Client/client/api/IConnection.cs
+++ b/projects/RabbitMQ.Client/client/api/IConnection.cs
@@ -166,6 +166,43 @@ public interface IConnection : INetworkConnection, IDisposable
         /// </remarks>
         event EventHandler<ShutdownEventArgs> ConnectionShutdown;
 
+        /// <summary>
+        /// Raised when the connection completes recovery.
+        /// </summary>
+        /// <remarks>
+        /// This event will never fire for connections that disable automatic recovery.
+        /// </remarks>
+        event EventHandler<EventArgs> RecoverySucceeded;
+
+        /// <summary>
+        /// Raised when the connection recovery fails, e.g. because reconnection or topology
+        /// recovery failed.
+        /// </summary>
+        /// <remarks>
+        /// This event will never fire for connections that disable automatic recovery.
+        /// </remarks>
+        event EventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError;
+
+        /// <summary>
+        /// Raised when the server-generated tag of a consumer registered on this connection changes during
+        /// connection recovery. This allows applications that need to be aware of server-generated
+        /// consumer tag values to keep track of the changes.
+        /// </summary>
+        /// <remarks>
+        /// This event will never fire for connections that disable automatic recovery.
+        /// </remarks>
+        event EventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery;
+
+        /// <summary>
+        /// Raised when the name of a server-named queue declared on this connection changes during
+        /// connection recovery. This allows applications that need to be aware of server-named
+        /// queue names to keep track of the changes.
+        /// </summary>
+        /// <remarks>
+        /// This event will never fire for connections that disable automatic recovery.
+        /// </remarks>
+        event EventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangeAfterRecovery;
+
         event EventHandler<EventArgs> ConnectionUnblocked;
 
         /// <summary>
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
index 5a9e846040..ff39ba4a95 100644
--- a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
+++ b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
@@ -44,7 +44,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl
 {
-    internal sealed class AutorecoveringConnection : IAutorecoveringConnection
+    internal sealed class AutorecoveringConnection : IConnection
     {
         private bool _disposed = false;
         private readonly object _eventLock = new object();
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
index 3b9753257e..6e2dc2aa67 100644
--- a/projects/RabbitMQ.Client/client/impl/Connection.cs
+++ b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -119,6 +119,7 @@ public Connection(IConnectionFactory factory, bool insist, IFrameHandler frameHa
         public event EventHandler<CallbackExceptionEventArgs> CallbackException;
 
         public event EventHandler<ConnectionBlockedEventArgs> ConnectionBlocked;
+        public event EventHandler<EventArgs> ConnectionUnblocked;
 
         public event EventHandler<ShutdownEventArgs> ConnectionShutdown
         {
@@ -149,10 +150,37 @@ public event EventHandler<ShutdownEventArgs> ConnectionShutdown
             }
         }
 
+        /// <summary>
+        /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
+        /// </summary>
+        public event EventHandler<EventArgs> RecoverySucceeded {
+            add { }
+            remove { }
+        }
 
+        /// <summary>
+        /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
+        /// </summary>
+        public event EventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError {
+            add { }
+            remove { }
+        }
 
-        public event EventHandler<EventArgs> ConnectionUnblocked;
+        /// <summary>
+        /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
+        /// </summary>
+        public event EventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery {
+            add { }
+            remove { }
+        }
 
+        /// <summary>
+        /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
+        /// </summary>
+        public event EventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangeAfterRecovery {
+            add { }
+            remove { }
+        }
 
         public string ClientProvidedName { get; }
 
diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt
index 75ceac3259..9400c9a247 100644
--- a/projects/Unit/APIApproval.Approve.verified.txt
+++ b/projects/Unit/APIApproval.Approve.verified.txt
@@ -231,13 +231,6 @@ namespace RabbitMQ.Client
         string Name { get; }
         RabbitMQ.Client.IAuthMechanism GetInstance();
     }
-    public interface IAutorecoveringConnection : RabbitMQ.Client.IConnection, RabbitMQ.Client.INetworkConnection, System.IDisposable
-    {
-        event System.EventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError;
-        event System.EventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery;
-        event System.EventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs> QueueNameChangeAfterRecovery;
-        event System.EventHandler<System.EventArgs> RecoverySucceeded;
-    }
     public interface IBasicConsumer
     {
         RabbitMQ.Client.IModel Model { get; }
@@ -316,8 +309,12 @@ namespace RabbitMQ.Client
         System.Collections.Generic.IList<RabbitMQ.Client.ShutdownReportEntry> ShutdownReport { get; }
         event System.EventHandler<RabbitMQ.Client.Events.CallbackExceptionEventArgs> CallbackException;
         event System.EventHandler<RabbitMQ.Client.Events.ConnectionBlockedEventArgs> ConnectionBlocked;
+        event System.EventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError;
         event System.EventHandler<RabbitMQ.Client.ShutdownEventArgs> ConnectionShutdown;
         event System.EventHandler<System.EventArgs> ConnectionUnblocked;
+        event System.EventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery;
+        event System.EventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs> QueueNameChangeAfterRecovery;
+        event System.EventHandler<System.EventArgs> RecoverySucceeded;
         void Abort();
         void Abort(System.TimeSpan timeout);
         void Abort(ushort reasonCode, string reasonText);