diff --git a/changelog.txt b/changelog.txt
index 847d6392db..c46703fd3d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 vNext
 ----------
+- [MINOR] changes accommodating the WrappedKeyAlgoIdentifier module (#2667)
+
+Version 21.2.0
+----------
 - [MINOR] Implement a WebView handler to facilitate broker app installation via the Play Store (#2643)
 - [MINOR] Add Get AAD device ID API for resource account (#2644)
 - [MINOR] Expose a JavaScript API in brokered Webviews to facilitate Improved Same Device NumberMatch (#2617)
@@ -8,7 +12,7 @@ vNext
 
 Version 21.1.0
 ----------
-- [PATCH] Allow generating wrapping key without PURPOSE_WRAP_KEY with Flight (#2633))
+- [PATCH] Allow generating wrapping key without PURPOSE_WRAP_KEY with Flight (#2633)
 - [MINOR] Adding a state parameter to prevent phish attacks, in “switch_browser” flow. (#2631)
 - [MINOR] Move camera logic to CameraPermissionRequestHandler and add SdmQrPinManager (#2630)
 - [MINOR] Pass Work Profile existence, OS Version, and Manufacturer to ESTS (#2627)
diff --git a/common4j/src/main/com/microsoft/identity/common/java/exception/ClientException.java b/common4j/src/main/com/microsoft/identity/common/java/exception/ClientException.java
index 099b29b20c..8397e5241f 100644
--- a/common4j/src/main/com/microsoft/identity/common/java/exception/ClientException.java
+++ b/common4j/src/main/com/microsoft/identity/common/java/exception/ClientException.java
@@ -496,6 +496,11 @@ public class ClientException extends BaseException {
      */
     public static final String NO_BROWSERS_AVAILABLE = "no_browsers_available";
 
+    /**
+     * The device doesn't support hardware wrapped key import.
+     */
+    public static final String DEVICE_NOT_SUPPORT_HARDWARE_WRAPPED_KEY_IMPORT = "device_not_supported_hardware_wrapped_key_import";
+
     /**
      * Constructor of ClientException.
      *
diff --git a/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java b/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
index b9739b9bfe..2264ad57b9 100644
--- a/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
+++ b/common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
@@ -64,4 +64,5 @@ public enum SpanName {
     ProcessCrossCloudRedirect,
     SwitchBrowserResume,
     SwitchBrowserProcess,
+    WrappedKeyAlgorithmIdentifier
 }