diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md
index d48bd8db1..8f2826160 100644
--- a/sdk/core/azure-core/CHANGELOG.md
+++ b/sdk/core/azure-core/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Removed `Context::GetApplicationContext()` in favor of a new static data member `Context::ApplicationContext`.
 - Renamed `Request::IsDownloadViaStream()` to `ShouldBufferResponse()`.
 - Removed the `Azure::Core::Http::Request` ctor overload that takes both a `bodyStream` and a `bufferedDownload` boolean since it is not useful.
diff --git a/sdk/core/azure-core/inc/azure/core/internal/client_options.hpp b/sdk/core/azure-core/inc/azure/core/internal/client_options.hpp
index 5ee84135e..48c74c564 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/client_options.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/client_options.hpp
@@ -24,6 +24,10 @@ namespace Azure { namespace Core { namespace _internal {
    */
   struct ClientOptions
   {
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~ClientOptions() = default;
 
     /**
diff --git a/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp
index 4fb5019d6..bce3b0bd8 100644
--- a/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp
+++ b/sdk/core/azure-core/inc/azure/core/modified_conditions.hpp
@@ -20,6 +20,10 @@ namespace Azure {
  */
 struct ModifiedConditions
 {
+  /**
+   * @brief Destructor.
+   *
+   */
   virtual ~ModifiedConditions() = default;
 
   /**
diff --git a/sdk/core/azure-core/inc/azure/core/paged_response.hpp b/sdk/core/azure-core/inc/azure/core/paged_response.hpp
index fd4be8a62..cbeb2b05f 100644
--- a/sdk/core/azure-core/inc/azure/core/paged_response.hpp
+++ b/sdk/core/azure-core/inc/azure/core/paged_response.hpp
@@ -40,6 +40,10 @@ namespace Azure { namespace Core {
     PagedResponse& operator=(PagedResponse&&) = default;
 
   public:
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~PagedResponse() = default;
 
     /**
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index 1a9acc0a4..11dd6088c 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 1.0.0-beta.6 (Unreleased)
 
+### Breaking Changes
+
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 
 ## 1.0.0-beta.5 (2021-04-07)
 
diff --git a/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
index bf4e2e00e..acb2989fb 100644
--- a/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Removed `KeyVaultException`.
 - Removed `ClientOptions`.
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
index c9ec762af..918a47839 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Renamed `GetPropertiesOfKeysSinglePage()` to `GetPropertiesOfKeys()`.
 - Renamed `GetPropertiesOfKeyVersionsSinglePage()` to `GetPropertiesOfKeyVersions()`.
 - Renamed `GetDeletedKeysSinglePage()` to `GetDeletedKeys()`.
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
index f7ce796f8..c5b1f2205 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
@@ -61,6 +61,10 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
     std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
 
   public:
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~KeyClient() = default;
 
     /**
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
index 9c45bc81e..1f2af0ae6 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
@@ -29,6 +29,10 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
    */
   struct CreateKeyOptions
   {
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~CreateKeyOptions() = default;
 
     /**
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp
index c894c9bd9..ef234aa07 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp
@@ -25,6 +25,10 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
    */
   struct KeyVaultKey
   {
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~KeyVaultKey() = default;
 
     /**
diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md
index 91b8bd883..b4b934707 100644
--- a/sdk/storage/azure-storage-blobs/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Renamed `HasMorePages()` in paged response to `HasPage()`.
 - Default chunk size for concurrent upload was changed to nullable.
 - `BlobLeaseClient::Change()` updates internal lease id.
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
index 409a842f1..6bb00d122 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
@@ -33,6 +33,10 @@ namespace Azure { namespace Storage { namespace Blobs {
    */
   class BlobClient {
   public:
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~BlobClient() = default;
 
     /**
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
index f3594b0ca..64c824695 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
@@ -31,6 +31,10 @@ namespace Azure { namespace Storage { namespace Blobs {
    */
   struct TagAccessConditions
   {
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~TagAccessConditions() = default;
 
     /**
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
index c5dc307e5..01dc3f337 100644
--- a/sdk/storage/azure-storage-common/CHANGELOG.md
+++ b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Removed `Azure::PagedResponse<T>`.
 
 ### Bug Fixes
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
index e4c279526..f7fa8a4a9 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
@@ -17,6 +17,10 @@ namespace Azure { namespace Storage {
    */
   struct LeaseAccessConditions
   {
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~LeaseAccessConditions() = default;
 
     /**
diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
index e936aa4d1..f3bbde4f0 100644
--- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Renamed `HasMorePages()` in paged response to `HasPage()`.
 - Default chunk size for concurrent upload was changed to nullable.
 - `DataLakeLeaseClient::Change()` updates internal lease id.
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
index 56d3d1566..08a7483ed 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
@@ -23,6 +23,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   class DataLakePathClient {
   public:
+    /**
+     * @brief Destructor.
+     *
+     */
     virtual ~DataLakePathClient() = default;
 
     /**
diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
index 838dfcdd8..443a52c25 100644
--- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Breaking Changes
 
+- Added `final` specifier to classes and structures that are are not expected to be inheritable at the moment.
 - Renamed `HasMorePages()` in paged response to `HasPage()`.
 - `ShareLeaseClient::Change()` updates internal lease id.
 - `ShareItem::ShareMetadata` was renamed to `ShareItem::Metadata`.