Back-port the following to the `6.x` branch: * https://github.com/rabbitmq/rabbitmq-dotnet-client/pull/1393 * https://github.com/rabbitmq/rabbitmq-dotnet-client/issues/1369
