From 768e313e1c965d8a1401d92726eae91409c9f4ea Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Tue, 18 May 2021 14:29:15 -0700
Subject: [PATCH 1/9] Set up STG78 branch (#21634)

---
 ...tSubmitBatchWithAccountSasCredentials.json | 102 ++---
 ...itBatchWithAccountSasCredentialsError.json | 102 ++---
 ...ubmitBatchWithContainerSasCredentials.json | 102 ++---
 ...BatchWithContainerSasCredentialsError.json | 102 ++---
 .../AzureFileSystemTestCreate[0].json         | 101 ++---
 .../AzureFileSystemTestCreate[1].json         | 257 +++++--------
 .../AzureFileSystemTestCreate[2].json         | 257 +++++--------
 .../AzureFileSystemTestCreate[3].json         | 257 +++++--------
 sdk/storage/azure-storage-blob/CHANGELOG.md   |   2 +-
 .../storage/blob/BlobServiceVersion.java      |   5 +-
 .../blob/sas/BlobSasServiceVersion.java       |   5 +-
 ...sClientTestsAccountSasBlobDeleteFails.json | 101 ++---
 .../SasClientTestsAccountSasBlobRead.json     | 109 ++----
 ...ntTestsAccountSasCreateContainerFails.json | 101 ++---
 ...estsAccountSasCreateContainerSucceeds.json | 122 ++----
 ...asClientTestsAccountSasFilterTagsFail.json | 101 ++---
 ...estsAccountSasImplUtilStringToSign[0].json |  83 ++---
 ...estsAccountSasImplUtilStringToSign[1].json |  83 ++---
 ...estsAccountSasImplUtilStringToSign[2].json |  83 ++---
 .../SasClientTestsAccountSasOnEndpoint.json   | 168 +++------
 ...lientTestsAccountSasTagsAndFilterTags.json | 133 +++----
 .../SasClientTestsAccountSasTagsFail.json     | 101 ++---
 ...obSasImplUtilCanonicalizedResource[0].json |  83 ++---
 ...obSasImplUtilCanonicalizedResource[1].json |  83 ++---
 ...obSasImplUtilCanonicalizedResource[2].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[0].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[10].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[11].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[12].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[13].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[14].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[15].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[16].json |  83 ++---
 ...UtilStringToSignUserDelegationKey[17].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[1].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[2].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[3].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[4].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[5].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[6].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[7].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[8].json |  83 ++---
 ...lUtilStringToSignUserDelegationKey[9].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[0].json |  83 ++---
 ...tTestsBlobSasImplUtilStringToSign[10].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[1].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[2].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[3].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[4].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[5].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[6].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[7].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[8].json |  83 ++---
 ...ntTestsBlobSasImplUtilStringToSign[9].json |  83 ++---
 .../SasClientTestsBlobSasReadPermissions.json | 143 +++----
 .../SasClientTestsBlobSasSnapshot.json        | 164 ++++----
 ...entTestsBlobSasSnapshotUserDelegation.json | 180 ++++-----
 .../SasClientTestsBlobSasTags.json            | 115 ++----
 .../SasClientTestsBlobSasTagsFail.json        | 101 ++---
 .../SasClientTestsBlobSasUserDelegation.json  | 159 ++++----
 ...SasClientTestsBlobUserDelegationSaoid.json | 125 +++----
 ...SasClientTestsCanUseSasToAuthenticate.json | 350 ++++++++----------
 ...sContainerSasIdentifierAndPermissions.json | 139 +++----
 .../SasClientTestsContainerSasTags.json       | 115 ++----
 .../SasClientTestsContainerSasTagsFail.json   | 101 ++---
 ...ClientTestsContainerSasUserDelegation.json | 117 ++----
 ...sContainerUserDelegationCorrelationId.json | 117 ++----
 ...ainerUserDelegationCorrelationIdError.json | 113 ++----
 .../ServiceAPITestSASSanitization[0].json     | 183 ++++-----
 .../ServiceAPITestSASSanitization[1].json     | 183 ++++-----
 ...leteBlobByVersionUsingAccountSASToken.json | 202 ++++------
 ...teBlobByVersionUsingContainerSASToken.json | 202 ++++------
 ...gTestDeleteBlobByVersionUsingSASToken.json | 202 ++++------
 .../common/implementation/Constants.java      |   2 +-
 .../azure-storage-file-datalake/CHANGELOG.md  |   2 +-
 .../file/datalake/DataLakeServiceVersion.java |   5 +-
 .../implementation/util/TransformUtils.java   |   2 +
 ...stRemoveACLRecursiveContinueOnFailure.json |   4 +-
 ...cursiveContinueOnFailureBatchFailures.json |  12 +-
 ...cursiveContinueOnFailureBatchesResume.json |  16 +-
 ...RemoveACLRecursiveProgressWithFailure.json |   4 +-
 ...ITestSetACLRecursiveContinueOnFailure.json |   4 +-
 ...cursiveContinueOnFailureBatchFailures.json |  12 +-
 ...cursiveContinueOnFailureBatchesResume.json |  16 +-
 ...estSetACLRecursiveProgressWithFailure.json |   4 +-
 ...stUpdateACLRecursiveContinueOnFailure.json |   4 +-
 ...cursiveContinueOnFailureBatchFailures.json |  12 +-
 ...cursiveContinueOnFailureBatchesResume.json |  16 +-
 ...UpdateACLRecursiveProgressWithFailure.json |   4 +-
 .../SASTestAccountSasCreateFileSystem.json    |   4 +-
 ...ASTestAccountSasCreateFileSystemError.json |   4 +-
 .../SASTestAccountSasFileDeleteError.json     |   4 +-
 .../SASTestAccountSasFileRead.json            |   4 +-
 .../SASTestAccountSasTokenOnEndpoint.json     |   4 +-
 .../SASTestCanUseSasToAuthenticate.json       |  26 +-
 .../SASTestDirectorySasPermission.json        |   6 +-
 .../SASTestDirectorySasPermissionFail.json    |   4 +-
 .../SASTestDirectoryUserDelegation.json       |   8 +-
 .../SASTestFileSasPermission.json             |   6 +-
 .../SASTestFileSystemSasIdentifier.json       |   6 +-
 .../SASTestFileSystemUserDelegation.json      |   4 +-
 ...FileSystemUserDelegationCorrelationId.json |   4 +-
 ...ystemUserDelegationCorrelationIdError.json |   4 +-
 .../SASTestFileUserDelegation.json            |   6 +-
 .../SASTestFileUserDelegationSaoid.json       |   8 +-
 .../SASTestFileUserDelegationSuoid.json       |  12 +-
 ...lUtilStringToSignUserDelegationKey[0].json |  26 +-
 ...UtilStringToSignUserDelegationKey[10].json |  26 +-
 ...UtilStringToSignUserDelegationKey[11].json |  26 +-
 ...UtilStringToSignUserDelegationKey[12].json |  26 +-
 ...UtilStringToSignUserDelegationKey[13].json |  26 +-
 ...UtilStringToSignUserDelegationKey[14].json |  26 +-
 ...UtilStringToSignUserDelegationKey[15].json |  26 +-
 ...UtilStringToSignUserDelegationKey[16].json |  26 +-
 ...UtilStringToSignUserDelegationKey[17].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[1].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[2].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[3].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[4].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[5].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[6].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[7].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[8].json |  26 +-
 ...lUtilStringToSignUserDelegationKey[9].json |  26 +-
 .../SASTestSasImplUtilStringToSign[0].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[1].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[2].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[3].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[4].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[5].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[6].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[7].json    |  26 +-
 .../SASTestSasImplUtilStringToSign[8].json    |  26 +-
 .../azure-storage-file-share/CHANGELOG.md     |   3 +-
 .../file/share/ShareServiceVersion.java       |   5 +-
 ...ntSASNetworkAccountSasTokenOnEndpoint.json | 118 ++----
 ...stsAccountSASNetworkCreateDeleteShare.json |  59 +--
 .../FileSASTestsCanUseSasToAuthenticate.json  | 288 +++++++-------
 ...TestsFileSASNetworkTestDownloadUpload.json | 158 +++-----
 ...SASTestsFileSASNetworkTestUploadFails.json | 124 +++----
 ...FileSASTestsFileSASPermissionsParseIA.json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[0].json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[1].json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[2].json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[3].json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[4].json |  25 +-
 ...ileSASTestsFileSASPermissionsParse[5].json |  25 +-
 ...SASTestsFileSASPermissionsToString[0].json |  25 +-
 ...SASTestsFileSASPermissionsToString[1].json |  25 +-
 ...SASTestsFileSASPermissionsToString[2].json |  25 +-
 ...SASTestsFileSASPermissionsToString[3].json |  25 +-
 ...SASTestsFileSASPermissionsToString[4].json |  25 +-
 .../FileSASTestsParseProtocol.json            | 116 +++---
 ...sShareSASNetworkIdentifierPermissions.json | 170 ++++-----
 ...ileSASTestsShareSASPermissionsParseIA.json |  25 +-
 ...leSASTestsShareSASPermissionsParse[0].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[1].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[2].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[3].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[4].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[5].json |  25 +-
 ...leSASTestsShareSASPermissionsParse[6].json |  25 +-
 ...ASTestsShareSASPermissionsToString[0].json |  25 +-
 ...ASTestsShareSASPermissionsToString[1].json |  25 +-
 ...ASTestsShareSASPermissionsToString[2].json |  25 +-
 ...ASTestsShareSASPermissionsToString[3].json |  25 +-
 ...ASTestsShareSASPermissionsToString[4].json |  25 +-
 ...ASTestsShareSASPermissionsToString[5].json |  25 +-
 ...stsAccountSASNetworkCreateDeleteShare.json | 126 +++----
 ...TestsFileSASNetworkTestDownloadUpload.json | 158 +++-----
 ...entTestsFileSASNetworkTestUploadFails.json | 124 +++----
 ...sShareSASNetworkIdentifierPermissions.json | 200 ++++------
 sdk/storage/azure-storage-queue/CHANGELOG.md  |   2 +-
 .../storage/queue/QueueServiceVersion.java    |   5 +-
 ...ueSASTestsAccountSASCreateDeleteQueue.json |  34 +-
 .../QueueSASTestsAccountSASListQueues.json    |   2 +-
 ...ueSASTestsAccountSASNetworkOnEndpoint.json |  34 +-
 .../QueueSASTestsCanUseSasToAuthenticate.json | 120 +++---
 ...sQueueSASEnqueueDequeueWithIdentifier.json |  88 ++---
 ...QueueSASEnqueueDequeueWithPermissions.json |  90 ++---
 ...ueueSASTestsQueueSASPermissionParseIA.json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[0].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[1].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[2].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[3].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[4].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[5].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[6].json |   2 +-
 ...eueSASTestsQueueSASPermissionParse[7].json |   2 +-
 ...SASTestsQueueSASPermissionToString[0].json |   2 +-
 ...SASTestsQueueSASPermissionToString[1].json |   2 +-
 ...SASTestsQueueSASPermissionToString[2].json |   2 +-
 ...SASTestsQueueSASPermissionToString[3].json |   2 +-
 ...SASTestsQueueSASPermissionToString[4].json |   2 +-
 ...SASTestsQueueSASPermissionToString[5].json |   2 +-
 ...tsQueueSASUpdateDeleteWithPermissions.json |  92 ++---
 ...sQueueServiceSASCanonicalizedResource.json |   2 +-
 ...ueSasClientTestsAccountSASCreateQueue.json |  68 ++--
 ...eueSasClientTestsAccountSASListQueues.json |  36 +-
 ...ueSasClientTestsQueueSASEnqueueWithId.json |  88 ++---
 ...SasClientTestsQueueSASEnqueueWithPerm.json |  90 ++---
 ...eSasClientTestsQueueSASUpdateWithPerm.json |  92 ++---
 202 files changed, 4327 insertions(+), 7924 deletions(-)

diff --git a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentials.json b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentials.json
index 9edf66ea3210..36bdde642951 100644
--- a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentials.json
+++ b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentials.json
@@ -1,110 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f65c7aef-a598-4791-8b0b-d193e4065434"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "544237d3-45f9-4e77-b4de-66d4ef75fc87"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE32D3E473",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D9171827D42C45",
+      "Last-Modified" : "Fri, 14 May 2021 20:37:56 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "83e24597-b01e-0063-6d97-42574a000000",
-      "x-ms-client-request-id" : "f65c7aef-a598-4791-8b0b-d193e4065434",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT"
+      "x-ms-request-id" : "94cdc414-601e-006f-3501-49d031000000",
+      "x-ms-client-request-id" : "544237d3-45f9-4e77-b4de-66d4ef75fc87",
+      "Date" : "Fri, 14 May 2021 20:37:55 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2/586f4ef51586f4ef5c4512822a10e2b4fda53485aa0a",
+    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25/586f4ef51586f4ef5fec361939908d560887545fda8a",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4ae1e420-c619-45fe-83da-a01201b7f146"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "168e0670-f4eb-4d6a-ae84-329766b04144"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE330960B1",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D9171828155F04",
+      "Last-Modified" : "Fri, 14 May 2021 20:37:56 GMT",
+      "x-ms-version-id" : "2021-05-14T20:37:56.8779012Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "346665ad-d01e-0017-4a97-4263ba000000",
+      "x-ms-request-id" : "94cdc51c-601e-006f-1001-49d031000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "4ae1e420-c619-45fe-83da-a01201b7f146",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-client-request-id" : "168e0670-f4eb-4d6a-ae84-329766b04144",
+      "Date" : "Fri, 14 May 2021 20:37:56 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2/586f4ef52586f4ef5c45941367ea8318fa03f4588bc7",
+    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25/586f4ef52586f4ef5fec7803856f4560506884da79bb",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "920f3112-4883-4a06-98ef-e3f0409e4485"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5d7431d3-7d54-44cc-b674-069343a8e7d0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3318578F",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D9171828319EB5",
+      "Last-Modified" : "Fri, 14 May 2021 20:37:57 GMT",
+      "x-ms-version-id" : "2021-05-14T20:37:57.0630325Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "83e24685-b01e-0063-2497-42574a000000",
+      "x-ms-request-id" : "94cdc55d-601e-006f-4d01-49d031000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "920f3112-4883-4a06-98ef-e3f0409e4485",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT"
+      "x-ms-client-request-id" : "5d7431d3-7d54-44cc-b674-069343a8e7d0",
+      "Date" : "Fri, 14 May 2021 20:37:56 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-08-04&ss=b&srt=sco&se=2021-05-07T16%3A44%3A21Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A37%3A57Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-batch/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "835f1660-b5e9-419b-bec0-d0fd8dbe1017",
-      "Content-Type" : "multipart/mixed; boundary=batch_f52883f0-9edf-4d1c-97a4-15bb47377c5e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-batch/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "11aaabdc-d2e0-48e2-88ed-ac144c8df7c6",
+      "Content-Type" : "multipart/mixed; boundary=batch_1f515686-6872-4114-b158-7c6f84ac9c4d"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "83e246de-b01e-0063-6e97-42574a000000",
-      "Body" : "--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 83e246de-b01e-0063-6e97-42574a1e8c16\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: db7b2546-ceb6-4ab9-b83d-8fc9c3e88434\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 83e246de-b01e-0063-6e97-42574a1e8c18\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 735d8d2d-09c2-4c80-962b-a9860ffaed75\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd--",
-      "x-ms-client-request-id" : "835f1660-b5e9-419b-bec0-d0fd8dbe1017",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT",
-      "Content-Type" : "multipart/mixed; boundary=batchresponse_33275719-28d4-4f27-ba3a-3d355f91ffbd"
+      "x-ms-request-id" : "94cdc629-601e-006f-0201-49d031000000",
+      "Body" : "--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 94cdc629-601e-006f-0201-49d0311eb593\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: f1d4ec3b-9db4-4c33-9116-b7dd52fb33b0\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 94cdc629-601e-006f-0201-49d0311eb597\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: 3d3abd7f-ee88-4cdb-a8dc-f99770f5230d\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c--",
+      "x-ms-client-request-id" : "11aaabdc-d2e0-48e2-88ed-ac144c8df7c6",
+      "Date" : "Fri, 14 May 2021 20:37:57 GMT",
+      "Content-Type" : "multipart/mixed; boundary=batchresponse_165f0ad1-ce93-4568-9904-6e9d975d050c"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/586f4ef50586f4ef5fec24809af199aa9766744f7a25?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "de1b315b-774f-4d63-9e36-7352947762a6"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "33296955-6c6a-4b00-adc5-15251d0aa0b6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "939b4b11-b01e-0001-0997-42956d000000",
-      "x-ms-client-request-id" : "de1b315b-774f-4d63-9e36-7352947762a6",
-      "Date" : "Thu, 06 May 2021 16:44:23 GMT"
+      "x-ms-request-id" : "94cdc751-601e-006f-0501-49d031000000",
+      "x-ms-client-request-id" : "33296955-6c6a-4b00-adc5-15251d0aa0b6",
+      "Date" : "Fri, 14 May 2021 20:37:57 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "586f4ef50586f4ef5c4502702b66e38e578cf4b8aba2", "586f4ef51586f4ef5c4512822a10e2b4fda53485aa0a", "586f4ef52586f4ef5c45941367ea8318fa03f4588bc7", "2021-05-06T16:44:21.858374200Z" ]
+  "variables" : [ "586f4ef50586f4ef5fec24809af199aa9766744f7a25", "586f4ef51586f4ef5fec361939908d560887545fda8a", "586f4ef52586f4ef5fec7803856f4560506884da79bb", "2021-05-14T20:37:57.272344200Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentialsError.json b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentialsError.json
index 7cfe1e3f7565..6fe6d63c92e9 100644
--- a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentialsError.json
+++ b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithAccountSasCredentialsError.json
@@ -1,110 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea3817ece3829494829210316844b7894?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea38171ec9033792efb15e7bf44a1f809?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "84bb5722-1252-43fc-b441-555abcc08c39"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a1603f96-1768-4009-9321-6f091722bc46"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE32D3CE4C",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D9171838017C26",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:23 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "939b477a-b01e-0001-6c97-42956d000000",
-      "x-ms-client-request-id" : "84bb5722-1252-43fc-b441-555abcc08c39",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-request-id" : "c8a5895b-401e-0047-2d01-49b199000000",
+      "x-ms-client-request-id" : "a1603f96-1768-4009-9321-6f091722bc46",
+      "Date" : "Fri, 14 May 2021 20:38:23 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea3817ece3829494829210316844b7894/56ea3817156ea3817ece681895cbab30e3cc54c4083d",
+    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea38171ec9033792efb15e7bf44a1f809/56ea3817156ea38171ec89915fe93a5e340ec46879fd",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "52bc6df8-0400-41ab-8eed-ce985d268f2b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d388cf26-04d3-4417-822d-43474610257f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3309399C",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917183859B514",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:24 GMT",
+      "x-ms-version-id" : "2021-05-14T20:38:24.1692948Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "83e2464b-b01e-0063-7897-42574a000000",
+      "x-ms-request-id" : "c8a589e5-401e-0047-1f01-49b199000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "52bc6df8-0400-41ab-8eed-ce985d268f2b",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT"
+      "x-ms-client-request-id" : "d388cf26-04d3-4417-822d-43474610257f",
+      "Date" : "Fri, 14 May 2021 20:38:23 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea3817ece3829494829210316844b7894/56ea3817256ea3817ece511229e9e52a84cf8444da47",
+    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea38171ec9033792efb15e7bf44a1f809/56ea3817256ea38171ec49358c039f29399854d3ebc9",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "91a7bb8d-3eeb-4c77-8205-371ce854a7c2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "34465b0a-9095-4a51-83cf-b2deeeedf523"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3317BB2E",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D9171838694849",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:24 GMT",
+      "x-ms-version-id" : "2021-05-14T20:38:24.2713673Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e94f0860-101e-0055-4497-42da3a000000",
+      "x-ms-request-id" : "c8a589f6-401e-0047-2e01-49b199000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "91a7bb8d-3eeb-4c77-8205-371ce854a7c2",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT"
+      "x-ms-client-request-id" : "34465b0a-9095-4a51-83cf-b2deeeedf523",
+      "Date" : "Fri, 14 May 2021 20:38:23 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-08-04&ss=b&srt=sco&se=2021-05-07T16%3A44%3A21Z&sp=rc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?comp=batch&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A38%3A24Z&sp=rc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-batch/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "419cc6c0-8622-46de-8d4e-a97dc372217f",
-      "Content-Type" : "multipart/mixed; boundary=batch_c4ec3615-ff91-4ae9-a45f-b1cc23aacc3e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-batch/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2cd7ff16-462c-4858-b19b-22dfe539158b",
+      "Content-Type" : "multipart/mixed; boundary=batch_683c919a-295b-4f35-b821-f84cb0f0e9cb"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e94f0900-101e-0055-5297-42da3a000000",
-      "Body" : "--batchresponse_6020ed0b-a4d4-432c-a558-4a6916a8e03b\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: e94f0900-101e-0055-5297-42da3a1ea692\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: f66f683a-0a71-4585-8ceb-69f480ed3ae0\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e94f0900-101e-0055-5297-42da3a1ea692\nTime:2021-05-06T16:44:21.9104205Z</Message></Error>\r\n--batchresponse_6020ed0b-a4d4-432c-a558-4a6916a8e03b\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: e94f0900-101e-0055-5297-42da3a1ea693\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 7b8fc69f-8484-4516-bef2-e182e6385d9e\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e94f0900-101e-0055-5297-42da3a1ea693\nTime:2021-05-06T16:44:21.9114215Z</Message></Error>\r\n--batchresponse_6020ed0b-a4d4-432c-a558-4a6916a8e03b--",
-      "x-ms-client-request-id" : "419cc6c0-8622-46de-8d4e-a97dc372217f",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT",
-      "Content-Type" : "multipart/mixed; boundary=batchresponse_6020ed0b-a4d4-432c-a558-4a6916a8e03b"
+      "x-ms-request-id" : "c8a58a36-401e-0047-6401-49b199000000",
+      "Body" : "--batchresponse_4fc0ba76-0023-4923-b9f8-9357a4094871\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: c8a58a36-401e-0047-6401-49b1991e60be\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: 8104f00d-5076-43a3-bfe7-3adcc1dbf920\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:c8a58a36-401e-0047-6401-49b1991e60be\nTime:2021-05-14T20:38:27.7841014Z</Message></Error>\r\n--batchresponse_4fc0ba76-0023-4923-b9f8-9357a4094871\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: c8a58a36-401e-0047-6401-49b1991e60e2\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: a0407674-f963-41dc-803d-7cd161f1f2ad\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:c8a58a36-401e-0047-6401-49b1991e60e2\nTime:2021-05-14T20:38:27.7851017Z</Message></Error>\r\n--batchresponse_4fc0ba76-0023-4923-b9f8-9357a4094871--",
+      "x-ms-client-request-id" : "2cd7ff16-462c-4858-b19b-22dfe539158b",
+      "Date" : "Fri, 14 May 2021 20:38:27 GMT",
+      "Content-Type" : "multipart/mixed; boundary=batchresponse_4fc0ba76-0023-4923-b9f8-9357a4094871"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea3817ece3829494829210316844b7894?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/56ea3817056ea38171ec9033792efb15e7bf44a1f809?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eadb03c5-8013-4481-a953-8bad0862c204"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "70621266-1794-4344-ad94-085ac6c8889b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "83e246fd-b01e-0063-0897-42574a000000",
-      "x-ms-client-request-id" : "eadb03c5-8013-4481-a953-8bad0862c204",
-      "Date" : "Thu, 06 May 2021 16:44:24 GMT"
+      "x-ms-request-id" : "c8a58e39-401e-0047-4e01-49b199000000",
+      "x-ms-client-request-id" : "70621266-1794-4344-ad94-085ac6c8889b",
+      "Date" : "Fri, 14 May 2021 20:38:27 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "56ea3817056ea3817ece3829494829210316844b7894", "56ea3817156ea3817ece681895cbab30e3cc54c4083d", "56ea3817256ea3817ece511229e9e52a84cf8444da47", "2021-05-06T16:44:21.857374300Z" ]
+  "variables" : [ "56ea3817056ea38171ec9033792efb15e7bf44a1f809", "56ea3817156ea38171ec89915fe93a5e340ec46879fd", "56ea3817256ea38171ec49358c039f29399854d3ebc9", "2021-05-14T20:38:24.420826400Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentials.json b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentials.json
index 98c00d6ff7a3..60a8a6e11536 100644
--- a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentials.json
+++ b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentials.json
@@ -1,110 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164a26716396eb5cb97a9727464bb0f?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164aa6889970cb4506f2212f4acf978?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "148e1a41-6098-4b24-9f65-1b24b0c42751"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ed7b8983-e65c-4cd6-b6ec-80f83eb99042"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE32D4214B",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917184B8BDE64",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:56 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "346664e1-d01e-0017-2b97-4263ba000000",
-      "x-ms-client-request-id" : "148e1a41-6098-4b24-9f65-1b24b0c42751",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-request-id" : "16abf2fc-901e-0044-2501-4950fd000000",
+      "x-ms-client-request-id" : "ed7b8983-e65c-4cd6-b6ec-80f83eb99042",
+      "Date" : "Fri, 14 May 2021 20:38:55 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164a26716396eb5cb97a9727464bb0f/0ea6164a10ea6164a26741159ff0021b48a6342baa51",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164aa6889970cb4506f2212f4acf978/0ea6164a10ea6164aa6822418263345b965c741acbdf",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b3b6c825-a46e-4082-8c9f-b3bb50031cd9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8b5e327b-edbf-4a39-b74e-7b82523cab18"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3309399C",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917184BF57317",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:57 GMT",
+      "x-ms-version-id" : "2021-05-14T20:38:57.0676784Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e94f0817-101e-0055-0297-42da3a000000",
+      "x-ms-request-id" : "16abf370-901e-0044-5401-4950fd000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "b3b6c825-a46e-4082-8c9f-b3bb50031cd9",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-client-request-id" : "8b5e327b-edbf-4a39-b74e-7b82523cab18",
+      "Date" : "Fri, 14 May 2021 20:38:56 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164a26716396eb5cb97a9727464bb0f/0ea6164a20ea6164a26766499945fad82b58e4fe9b96",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164aa6889970cb4506f2212f4acf978/0ea6164a20ea6164aa68570555119247df26648d79b2",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "93d39e9c-7892-42a6-8e6f-63ce47c1f348"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a6965712-2497-41b8-9a79-7991da250f0e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3317E243",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917184C05C9C6",
+      "Last-Modified" : "Fri, 14 May 2021 20:38:57 GMT",
+      "x-ms-version-id" : "2021-05-14T20:38:57.1737542Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "346665d8-d01e-0017-6b97-4263ba000000",
+      "x-ms-request-id" : "16abf38f-901e-0044-6101-4950fd000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "93d39e9c-7892-42a6-8e6f-63ce47c1f348",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT"
+      "x-ms-client-request-id" : "a6965712-2497-41b8-9a79-7991da250f0e",
+      "Date" : "Fri, 14 May 2021 20:38:56 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164a26716396eb5cb97a9727464bb0f?restype=container&comp=batch&sv=2020-08-04&spr=https%2Chttp&st=2021-05-05T16%3A44%3A21Z&se=2021-05-07T16%3A44%3A21Z&sr=c&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164aa6889970cb4506f2212f4acf978?restype=container&comp=batch&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A38%3A57Z&se=2021-05-15T20%3A38%3A57Z&sr=c&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-batch/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5ae1196c-6524-4a53-a3e4-ec9463b49498",
-      "Content-Type" : "multipart/mixed; boundary=batch_89505eaa-7361-41b7-be16-d9878d6b784e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-batch/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "04983699-d5de-4c55-8129-f0ed359b4062",
+      "Content-Type" : "multipart/mixed; boundary=batch_89d43e0a-812b-4998-87e5-dc7191f29150"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "939b4a5a-b01e-0001-6b97-42956d000000",
-      "Body" : "--batchresponse_5a85ae9a-48bb-4958-9ee8-1826a4a19cd6\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 939b4a5a-b01e-0001-6b97-42956d1ec598\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 825448c7-ccdb-49a0-be3e-6b368ea1893e\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_5a85ae9a-48bb-4958-9ee8-1826a4a19cd6\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 939b4a5a-b01e-0001-6b97-42956d1ec59a\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: c5128681-22a2-448a-af7d-535642aa13ca\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_5a85ae9a-48bb-4958-9ee8-1826a4a19cd6--",
-      "x-ms-client-request-id" : "5ae1196c-6524-4a53-a3e4-ec9463b49498",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT",
-      "Content-Type" : "multipart/mixed; boundary=batchresponse_5a85ae9a-48bb-4958-9ee8-1826a4a19cd6"
+      "x-ms-request-id" : "16abf3f4-901e-0044-2101-4950fd000000",
+      "Body" : "--batchresponse_d7be84cf-41b0-488f-8187-2e2ec804384d\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 16abf3f4-901e-0044-2101-4950fd1ec68e\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: dcb63471-f863-4bbc-bae1-d29597388389\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_d7be84cf-41b0-488f-8187-2e2ec804384d\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 202 Accepted\r\nx-ms-delete-type-permanent: true\r\nx-ms-request-id: 16abf3f4-901e-0044-2101-4950fd1ec68f\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: a9c8d10d-8219-41bb-8ba2-f03b6459a1c1\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n--batchresponse_d7be84cf-41b0-488f-8187-2e2ec804384d--",
+      "x-ms-client-request-id" : "04983699-d5de-4c55-8129-f0ed359b4062",
+      "Date" : "Fri, 14 May 2021 20:38:56 GMT",
+      "Content-Type" : "multipart/mixed; boundary=batchresponse_d7be84cf-41b0-488f-8187-2e2ec804384d"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164a26716396eb5cb97a9727464bb0f?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0ea6164a00ea6164aa6889970cb4506f2212f4acf978?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "df3973b3-6f11-4e67-88d9-8eb2d90ae1a0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "527905d0-be36-480b-b975-0fd533ef5eea"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "3466669a-d01e-0017-0d97-4263ba000000",
-      "x-ms-client-request-id" : "df3973b3-6f11-4e67-88d9-8eb2d90ae1a0",
-      "Date" : "Thu, 06 May 2021 16:44:23 GMT"
+      "x-ms-request-id" : "16abf401-901e-0044-2901-4950fd000000",
+      "x-ms-client-request-id" : "527905d0-be36-480b-b975-0fd533ef5eea",
+      "Date" : "Fri, 14 May 2021 20:38:57 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "0ea6164a00ea6164a26716396eb5cb97a9727464bb0f", "0ea6164a10ea6164a26741159ff0021b48a6342baa51", "0ea6164a20ea6164a26766499945fad82b58e4fe9b96", "2021-05-06T16:44:21.844375500Z", "2021-05-06T16:44:21.871373Z" ]
+  "variables" : [ "0ea6164a00ea6164aa6889970cb4506f2212f4acf978", "0ea6164a10ea6164aa6822418263345b965c741acbdf", "0ea6164a20ea6164aa68570555119247df26648d79b2", "2021-05-14T20:38:57.302113900Z", "2021-05-14T20:38:57.348113500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentialsError.json b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentialsError.json
index ce52ddf26e71..07caed01e2e4 100644
--- a/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentialsError.json
+++ b/sdk/storage/azure-storage-blob-batch/src/test/resources/session-records/BatchAPITestSubmitBatchWithContainerSasCredentialsError.json
@@ -1,110 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd782f636164642c44d4fe58c4ef7a32?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd7825339763098129e944f5f486dab8?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ebe530a8-e983-408f-970a-615db29fa878"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8fc0493a-7b51-49c7-8bb6-94f916bc6603"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE32D3C721",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917185ECFE703",
+      "Last-Modified" : "Fri, 14 May 2021 20:39:28 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e94f06f6-101e-0055-0997-42da3a000000",
-      "x-ms-client-request-id" : "ebe530a8-e983-408f-970a-615db29fa878",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-request-id" : "fde40695-d01e-0008-4401-49c0cd000000",
+      "x-ms-client-request-id" : "8fc0493a-7b51-49c7-8bb6-94f916bc6603",
+      "Date" : "Fri, 14 May 2021 20:39:28 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd782f636164642c44d4fe58c4ef7a32/b85bd7821b85bd782f63500506c145e2ebec546e28bf",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd7825339763098129e944f5f486dab8/b85bd7821b85bd782533306416756d40521574c68bc5",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6a06880e-72bb-464c-a3d8-607c31e4c0a9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8d13a074-7f4d-4fa7-aaf8-80270968080d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE330960B1",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917185F3013AB",
+      "Last-Modified" : "Fri, 14 May 2021 20:39:29 GMT",
+      "x-ms-version-id" : "2021-05-14T20:39:29.3276075Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "939b4937-b01e-0001-6f97-42956d000000",
+      "x-ms-request-id" : "fde407af-d01e-0008-2501-49c0cd000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "6a06880e-72bb-464c-a3d8-607c31e4c0a9",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-client-request-id" : "8d13a074-7f4d-4fa7-aaf8-80270968080d",
+      "Date" : "Fri, 14 May 2021 20:39:29 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd782f636164642c44d4fe58c4ef7a32/b85bd7822b85bd782f63436690eac9e4098c54549b9d",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd7825339763098129e944f5f486dab8/b85bd7822b85bd78253307106050446876a714a25b33",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "66a216a9-1507-4701-9765-94e56903a348"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cad1b3e7-1c41-498b-b75c-7afab0dbe64c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910AE3317BB2E",
-      "Last-Modified" : "Thu, 06 May 2021 16:44:21 GMT",
+      "eTag" : "0x8D917185F3FF513",
+      "Last-Modified" : "Fri, 14 May 2021 20:39:29 GMT",
+      "x-ms-version-id" : "2021-05-14T20:39:29.4316819Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "939b4996-b01e-0001-3f97-42956d000000",
+      "x-ms-request-id" : "fde407f1-d01e-0008-5a01-49c0cd000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "66a216a9-1507-4701-9765-94e56903a348",
-      "Date" : "Thu, 06 May 2021 16:44:20 GMT"
+      "x-ms-client-request-id" : "cad1b3e7-1c41-498b-b75c-7afab0dbe64c",
+      "Date" : "Fri, 14 May 2021 20:39:29 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd782f636164642c44d4fe58c4ef7a32?restype=container&comp=batch&sv=2020-08-04&spr=https%2Chttp&st=2021-05-05T16%3A44%3A21Z&se=2021-05-07T16%3A44%3A21Z&sr=c&sp=rcw&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd7825339763098129e944f5f486dab8?restype=container&comp=batch&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A39%3A29Z&se=2021-05-15T20%3A39%3A29Z&sr=c&sp=rcw&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-batch/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c2f24476-5a42-44b4-86d7-d059e422ae11",
-      "Content-Type" : "multipart/mixed; boundary=batch_0e05aa41-500b-4c21-8482-8bada3cbab5e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-batch/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d829237a-da16-48a1-bf97-1584cc37f7b1",
+      "Content-Type" : "multipart/mixed; boundary=batch_8c3b3084-8a91-4362-8c94-881b603f4aa1"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "34666651-d01e-0017-4e97-4263ba000000",
-      "Body" : "--batchresponse_74bc9432-eef5-47e6-9ada-4ba531b3f6d1\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: 34666651-d01e-0017-4e97-4263ba1e8bcc\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 09b25c65-20cb-48a4-a8fd-8c398a369d1d\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:34666651-d01e-0017-4e97-4263ba1e8bcc\nTime:2021-05-06T16:44:21.9087296Z</Message></Error>\r\n--batchresponse_74bc9432-eef5-47e6-9ada-4ba531b3f6d1\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: 34666651-d01e-0017-4e97-4263ba1e8bcd\r\nx-ms-version: 2020-08-04\r\nx-ms-client-request-id: 70922cac-f056-44ee-8196-2c5e0456a7eb\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:34666651-d01e-0017-4e97-4263ba1e8bcd\nTime:2021-05-06T16:44:21.9097301Z</Message></Error>\r\n--batchresponse_74bc9432-eef5-47e6-9ada-4ba531b3f6d1--",
-      "x-ms-client-request-id" : "c2f24476-5a42-44b4-86d7-d059e422ae11",
-      "Date" : "Thu, 06 May 2021 16:44:21 GMT",
-      "Content-Type" : "multipart/mixed; boundary=batchresponse_74bc9432-eef5-47e6-9ada-4ba531b3f6d1"
+      "x-ms-request-id" : "fde40858-d01e-0008-3701-49c0cd000000",
+      "Body" : "--batchresponse_4edd0ee4-e85f-4546-8b51-69ac94df3324\r\nContent-Type: application/http\r\nContent-ID: 0\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: fde40858-d01e-0008-3701-49c0cd1ebb3f\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: ec72347b-ca9e-4ed7-b32e-74089a51ac85\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:fde40858-d01e-0008-3701-49c0cd1ebb3f\nTime:2021-05-14T20:39:30.8248277Z</Message></Error>\r\n--batchresponse_4edd0ee4-e85f-4546-8b51-69ac94df3324\r\nContent-Type: application/http\r\nContent-ID: 1\r\n\r\nHTTP/1.1 403 This request is not authorized to perform this operation using this permission.\r\nx-ms-error-code: AuthorizationPermissionMismatch\r\nx-ms-request-id: fde40858-d01e-0008-3701-49c0cd1ebb47\r\nx-ms-version: 2020-10-02\r\nx-ms-client-request-id: 434505b7-d07b-4ff4-a255-3802d5693efd\r\nContent-Length: 280\r\nContent-Type: application/xml\r\nServer: Windows-Azure-Blob/1.0\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:fde40858-d01e-0008-3701-49c0cd1ebb47\nTime:2021-05-14T20:39:30.8258284Z</Message></Error>\r\n--batchresponse_4edd0ee4-e85f-4546-8b51-69ac94df3324--",
+      "x-ms-client-request-id" : "d829237a-da16-48a1-bf97-1584cc37f7b1",
+      "Date" : "Fri, 14 May 2021 20:39:30 GMT",
+      "Content-Type" : "multipart/mixed; boundary=batchresponse_4edd0ee4-e85f-4546-8b51-69ac94df3324"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd782f636164642c44d4fe58c4ef7a32?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b85bd7820b85bd7825339763098129e944f5f486dab8?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "26b3b756-09ff-43dc-b97d-47606d3a26fb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ded68de4-7032-43b1-b57c-6c6939d7b315"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e94f095b-101e-0055-1e97-42da3a000000",
-      "x-ms-client-request-id" : "26b3b756-09ff-43dc-b97d-47606d3a26fb",
-      "Date" : "Thu, 06 May 2021 16:44:23 GMT"
+      "x-ms-request-id" : "fde40a22-d01e-0008-4101-49c0cd000000",
+      "x-ms-client-request-id" : "ded68de4-7032-43b1-b57c-6c6939d7b315",
+      "Date" : "Fri, 14 May 2021 20:39:30 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "b85bd7820b85bd782f636164642c44d4fe58c4ef7a32", "b85bd7821b85bd782f63500506c145e2ebec546e28bf", "b85bd7822b85bd782f63436690eac9e4098c54549b9d", "2021-05-06T16:44:21.843371200Z", "2021-05-06T16:44:21.871373Z" ]
+  "variables" : [ "b85bd7820b85bd7825339763098129e944f5f486dab8", "b85bd7821b85bd782533306416756d40521574c68bc5", "b85bd7822b85bd78253307106050446876a714a25b33", "2021-05-14T20:39:29.557852900Z", "2021-05-14T20:39:29.601852100Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[0].json b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[0].json
index 4a319aa3625e..b6e8020f3fb1 100644
--- a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[0].json
+++ b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[0].json
@@ -1,114 +1,75 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c961d439353c9a92b5b3b0412aa1d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c99a01549133a717c6a17944018b2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d417afee-3e10-4a42-8159-bd10191de6d3"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "dc8d5cc8-b14e-4f44-ab8e-e5112f1d7497"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "51bffc2b-e01e-0033-2ad4-41951a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:51bffc2b-e01e-0033-2ad4-41951a000000\nTime:2021-05-05T17:28:59.7580263Z</Message></Error>",
-      "x-ms-client-request-id" : "d417afee-3e10-4a42-8159-bd10191de6d3",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "204cb4a5-301e-003f-1401-491261000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:204cb4a5-301e-003f-1401-491261000000\nTime:2021-05-14T20:44:22.0935483Z</Message></Error>",
+      "x-ms-client-request-id" : "dc8d5cc8-b14e-4f44-ab8e-e5112f1d7497",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c961d439353c9a92b5b3b0412aa1d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c99a01549133a717c6a17944018b2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "26a26af0-9eff-48c6-9599-569d10d31249"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ade81e31-0c47-4bd6-943b-51e8c5721f54"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB4502DC55",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "eTag" : "0x8D917190DE0A666",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1b93b3e8-201e-0013-53d4-41eebd000000",
-      "x-ms-client-request-id" : "26a26af0-9eff-48c6-9599-569d10d31249",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "10b9e75f-f01e-006d-0401-496e89000000",
+      "x-ms-client-request-id" : "ade81e31-0c47-4bd6-943b-51e8c5721f54",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c961d439353c9a92b5b3b0412aa1d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c99a01549133a717c6a17944018b2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "262f0a72-4953-489b-ae0c-a84230d6f089"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6736536d-adb8-4611-add5-b06a63ee2ae1"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB4502DC55",
-      "x-ms-request-id" : "51bffcca-e01e-0033-39d4-41951a000000",
-      "x-ms-client-request-id" : "262f0a72-4953-489b-ae0c-a84230d6f089"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=da2458c9",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a6a6db37-9e3b-4e3c-af15-660b083a3ee3"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "7d095c21-c01e-0069-1dd4-41f3fd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>da2458c9</Prefix><Containers><Container><Name>da2458c91da2458c961d439353c9a92b5b3b0412aa1d</Name><Properties><Last-Modified>Wed, 05 May 2021 17:28:59 GMT</Last-Modified><Etag>\"0x8D90FEB4502DC55\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "a6a6db37-9e3b-4e3c-af15-660b083a3ee3",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da2458c91da2458c961d439353c9a92b5b3b0412aa1d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ab5d7ca2-1799-4959-8b83-7b28d8e47164"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "51bffd19-e01e-0033-7dd4-41951a000000",
-      "x-ms-client-request-id" : "ab5d7ca2-1799-4959-8b83-7b28d8e47164",
-      "Date" : "Wed, 05 May 2021 17:29:01 GMT"
+      "eTag" : "0x8D917190DE0A666",
+      "x-ms-request-id" : "204cb59a-301e-003f-6501-491261000000",
+      "x-ms-client-request-id" : "6736536d-adb8-4611-add5-b06a63ee2ae1"
     },
     "Exception" : null
   } ],
-  "variables" : [ "da2458c90da2458c961d30717cdfbaa639cec48b7856", "da2458c91da2458c961d439353c9a92b5b3b0412aa1d" ]
+  "variables" : [ "da2458c90da2458c99a03745852885410f9c64fc2ad1", "da2458c91da2458c99a01549133a717c6a17944018b2" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[1].json b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[1].json
index 454166bda272..9c9c3ec8d3c8 100644
--- a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[1].json
+++ b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[1].json
@@ -1,292 +1,217 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988a5c776417b908b66a51d4c79836?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988b8945106734a080a660147abac2?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "badaf605-8b1e-425f-bd3e-83f46c58857e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "420a4629-cd37-4e44-9cd4-5250ef0d7d32"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "7d095ad6-c01e-0069-70d4-41f3fd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:7d095ad6-c01e-0069-70d4-41f3fd000000\nTime:2021-05-05T17:28:59.7573268Z</Message></Error>",
-      "x-ms-client-request-id" : "badaf605-8b1e-425f-bd3e-83f46c58857e",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "bf0166d1-101e-0007-7b01-49b6a1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:bf0166d1-101e-0007-7b01-49b6a1000000\nTime:2021-05-14T20:44:22.0925809Z</Message></Error>",
+      "x-ms-client-request-id" : "420a4629-cd37-4e44-9cd4-5250ef0d7d32",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988a5c776417b908b66a51d4c79836?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988b8945106734a080a660147abac2?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2b9cf547-20ec-4846-b76f-a3eb0f419a7a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e0412983-e91a-4d1e-a65f-6cc5d5b93726"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB450350B1",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "eTag" : "0x8D917190DE0DC4E",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6e30e5a7-b01e-0011-0fd4-415005000000",
-      "x-ms-client-request-id" : "2b9cf547-20ec-4846-b76f-a3eb0f419a7a",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "e71e5f88-d01e-0055-6e01-49ca49000000",
+      "x-ms-client-request-id" : "e0412983-e91a-4d1e-a65f-6cc5d5b93726",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988a5c917790c74321e6ddb4fb8974?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988b89977470838fcb94c974008b55?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a635e582-c9e3-4055-88c7-ca4528e38d40"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ec41ef90-574d-45ea-aa2e-ceabc53ef627"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "1b93b44f-201e-0013-35d4-41eebd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:1b93b44f-201e-0013-35d4-41eebd000000\nTime:2021-05-05T17:29:00.0643464Z</Message></Error>",
-      "x-ms-client-request-id" : "a635e582-c9e3-4055-88c7-ca4528e38d40",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "e71e601f-d01e-0055-7601-49ca49000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:e71e601f-d01e-0055-7601-49ca49000000\nTime:2021-05-14T20:44:22.7269596Z</Message></Error>",
+      "x-ms-client-request-id" : "ec41ef90-574d-45ea-aa2e-ceabc53ef627",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988a5c917790c74321e6ddb4fb8974?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988b89977470838fcb94c974008b55?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d705a2a7-bef9-49c8-91c2-6ed8a3350ae8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "22b2d560-ce61-4b71-b608-a6c8e92cbf69"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB4556051B",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E1AACAC",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "3db1b32d-801e-0057-3ed4-416482000000",
-      "x-ms-client-request-id" : "d705a2a7-bef9-49c8-91c2-6ed8a3350ae8",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "10b9e7f2-f01e-006d-0801-496e89000000",
+      "x-ms-client-request-id" : "22b2d560-ce61-4b71-b608-a6c8e92cbf69",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988a5c33218b633610242484e59a81?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988b8999822187688f01e4e4dca8cd?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c80dc9bd-42af-4057-b87e-ff553364cda2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6512cf4b-667b-4ce0-bbf1-fd69bef5a0ff"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "7d095cbc-c01e-0069-28d4-41f3fd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:7d095cbc-c01e-0069-28d4-41f3fd000000\nTime:2021-05-05T17:29:00.5398740Z</Message></Error>",
-      "x-ms-client-request-id" : "c80dc9bd-42af-4057-b87e-ff553364cda2",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "x-ms-request-id" : "bf016838-101e-0007-3501-49b6a1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:bf016838-101e-0007-3501-49b6a1000000\nTime:2021-05-14T20:44:22.8571253Z</Message></Error>",
+      "x-ms-client-request-id" : "6512cf4b-667b-4ce0-bbf1-fd69bef5a0ff",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988a5c33218b633610242484e59a81?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988b8999822187688f01e4e4dca8cd?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5560c969-dbd5-405f-a9ff-4adaf7e940d2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "34a8800e-a7fe-4657-9dce-f4ca1436ae7c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB456CD3DC",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E30A9A8",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6e30e79a-b01e-0011-42d4-415005000000",
-      "x-ms-client-request-id" : "5560c969-dbd5-405f-a9ff-4adaf7e940d2",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "10b9e827-f01e-006d-3a01-496e89000000",
+      "x-ms-client-request-id" : "34a8800e-a7fe-4657-9dce-f4ca1436ae7c",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988a5c776417b908b66a51d4c79836?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988b8945106734a080a660147abac2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "34c1abad-5992-4d5d-bb71-4c523203b2ea"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "095f9b2d-6ffe-4b96-9ded-02394a6fa2f1"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB450350B1",
-      "x-ms-request-id" : "1b93b624-201e-0013-61d4-41eebd000000",
-      "x-ms-client-request-id" : "34c1abad-5992-4d5d-bb71-4c523203b2ea"
+      "eTag" : "0x8D917190DE0DC4E",
+      "x-ms-request-id" : "bf016876-101e-0007-6b01-49b6a1000000",
+      "x-ms-client-request-id" : "095f9b2d-6ffe-4b96-9ded-02394a6fa2f1"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988a5c917790c74321e6ddb4fb8974?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988b89977470838fcb94c974008b55?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e40afec4-f59a-40af-b6ab-7bfb0f2fdf84"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "046898c8-b71e-42f0-8022-12fe080b315b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB4556051B",
-      "x-ms-request-id" : "6e30e807-b01e-0011-20d4-415005000000",
-      "x-ms-client-request-id" : "e40afec4-f59a-40af-b6ab-7bfb0f2fdf84"
+      "eTag" : "0x8D917190E1AACAC",
+      "x-ms-request-id" : "10b9e868-f01e-006d-6e01-496e89000000",
+      "x-ms-client-request-id" : "046898c8-b71e-42f0-8022-12fe080b315b"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988a5c33218b633610242484e59a81?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988b8999822187688f01e4e4dca8cd?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "60933dac-d6aa-47fd-9832-a63af943c423"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "54afda80-0c7b-4ae6-a163-9fa28c72cd9e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB456CD3DC",
-      "x-ms-request-id" : "1b93b685-201e-0013-3ad4-41eebd000000",
-      "x-ms-client-request-id" : "60933dac-d6aa-47fd-9832-a63af943c423"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=c33f6988",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eb1694a5-58ca-46b5-8eaa-6f70efe2b448"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "6e30e86d-b01e-0011-7ed4-415005000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>c33f6988</Prefix><Containers><Container><Name>c33f69881c33f6988a5c776417b908b66a51d4c79836</Name><Properties><Last-Modified>Wed, 05 May 2021 17:28:59 GMT</Last-Modified><Etag>\"0x8D90FEB450350B1\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>c33f69882c33f6988a5c917790c74321e6ddb4fb8974</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB4556051B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>c33f69883c33f6988a5c33218b633610242484e59a81</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB456CD3DC\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "eb1694a5-58ca-46b5-8eaa-6f70efe2b448",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69881c33f6988a5c776417b908b66a51d4c79836?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a7aaa2ac-b742-4d8d-a15f-32ce3ac05148"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1b93b727-201e-0013-53d4-41eebd000000",
-      "x-ms-client-request-id" : "a7aaa2ac-b742-4d8d-a15f-32ce3ac05148",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69882c33f6988a5c917790c74321e6ddb4fb8974?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2f323e0c-8ed1-4245-905c-b1a5e83fa841"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1b93b816-201e-0013-2ad4-41eebd000000",
-      "x-ms-client-request-id" : "2f323e0c-8ed1-4245-905c-b1a5e83fa841",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c33f69883c33f6988a5c33218b633610242484e59a81?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0d5bd9cd-a772-416a-9f63-a8d221a92c29"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "7d095edf-c01e-0069-0fd4-41f3fd000000",
-      "x-ms-client-request-id" : "0d5bd9cd-a772-416a-9f63-a8d221a92c29",
-      "Date" : "Wed, 05 May 2021 17:29:01 GMT"
+      "eTag" : "0x8D917190E30A9A8",
+      "x-ms-request-id" : "bf0168b1-101e-0007-2401-49b6a1000000",
+      "x-ms-client-request-id" : "54afda80-0c7b-4ae6-a163-9fa28c72cd9e"
     },
     "Exception" : null
   } ],
-  "variables" : [ "c33f69880c33f6988a5c02371ddebfc8a34de4f60bd2", "c33f69881c33f6988a5c776417b908b66a51d4c79836", "c33f69882c33f6988a5c917790c74321e6ddb4fb8974", "c33f69883c33f6988a5c33218b633610242484e59a81", "2021-05-05T17:28:57.490795400Z" ]
+  "variables" : [ "c33f69880c33f6988b8970872398c39c448ab495a8c7", "c33f69881c33f6988b8945106734a080a660147abac2", "c33f69882c33f6988b89977470838fcb94c974008b55", "c33f69883c33f6988b8999822187688f01e4e4dca8cd", "2021-05-14T20:44:19.749282900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[2].json b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[2].json
index 132e3746d493..6dde8a50b1a5 100644
--- a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[2].json
+++ b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[2].json
@@ -1,292 +1,217 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4be1a146855a64c9c6accf4891a75?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4bfae32610790792e7329e4033aed?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c38f863b-0c0c-422a-81c8-1205674cd7b1"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "80e6f165-a8aa-4395-bcce-d61baa3e31b6"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "6e30e51b-b01e-0011-14d4-415005000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:6e30e51b-b01e-0011-14d4-415005000000\nTime:2021-05-05T17:28:59.7591059Z</Message></Error>",
-      "x-ms-client-request-id" : "c38f863b-0c0c-422a-81c8-1205674cd7b1",
-      "Date" : "Wed, 05 May 2021 17:28:58 GMT",
+      "x-ms-request-id" : "10b9e6ee-f01e-006d-2901-496e89000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:10b9e6ee-f01e-006d-2901-496e89000000\nTime:2021-05-14T20:44:22.0911322Z</Message></Error>",
+      "x-ms-client-request-id" : "80e6f165-a8aa-4395-bcce-d61baa3e31b6",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4be1a146855a64c9c6accf4891a75?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4bfae32610790792e7329e4033aed?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0d3c9bbc-c0a3-4909-a9dd-4c4ed1c6284f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "41f91d34-97a7-4d11-a774-77654b9875b4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB4502FF6C",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "eTag" : "0x8D917190DE104D6",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "51bffc74-e01e-0033-6ad4-41951a000000",
-      "x-ms-client-request-id" : "0d3c9bbc-c0a3-4909-a9dd-4c4ed1c6284f",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "204cb527-301e-003f-7e01-491261000000",
+      "x-ms-client-request-id" : "41f91d34-97a7-4d11-a774-77654b9875b4",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4be1a715028f51095f28b94ce7b24?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4bfae87194655f904250bb412297b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "221a5db3-d760-49ed-b8cb-ec589ec8178f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "abf80639-5c3e-4255-9595-0b31f118eb5c"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "6e30e613-b01e-0011-70d4-415005000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:6e30e613-b01e-0011-70d4-415005000000\nTime:2021-05-05T17:29:00.0673255Z</Message></Error>",
-      "x-ms-client-request-id" : "221a5db3-d760-49ed-b8cb-ec589ec8178f",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "bf0167ed-101e-0007-7301-49b6a1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:bf0167ed-101e-0007-7301-49b6a1000000\nTime:2021-05-14T20:44:22.7260319Z</Message></Error>",
+      "x-ms-client-request-id" : "abf80639-5c3e-4255-9595-0b31f118eb5c",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4be1a715028f51095f28b94ce7b24?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4bfae87194655f904250bb412297b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a44b7014-f4d8-40ba-82ab-e6caedab22be"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4707c44c-561f-4da9-8c76-2e4a6a95e237"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB4524E976",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E1B09A0",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1b93b48c-201e-0013-6dd4-41eebd000000",
-      "x-ms-client-request-id" : "a44b7014-f4d8-40ba-82ab-e6caedab22be",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "e71e6049-d01e-0055-1a01-49ca49000000",
+      "x-ms-client-request-id" : "4707c44c-561f-4da9-8c76-2e4a6a95e237",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4be1a34160b273f37724524a6bb34?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4bfae69651a5c93971ff5749599e9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5319e43a-75e2-4019-8486-24940300e3aa"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "02023a9f-5c80-49bd-96a3-6e2dd020e0ac"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "51bffce8-e01e-0033-54d4-41951a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:51bffce8-e01e-0033-54d4-41951a000000\nTime:2021-05-05T17:29:00.2193515Z</Message></Error>",
-      "x-ms-client-request-id" : "5319e43a-75e2-4019-8486-24940300e3aa",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "x-ms-request-id" : "e71e606a-d01e-0055-3801-49ca49000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:e71e606a-d01e-0055-3801-49ca49000000\nTime:2021-05-14T20:44:22.8590528Z</Message></Error>",
+      "x-ms-client-request-id" : "02023a9f-5c80-49bd-96a3-6e2dd020e0ac",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4be1a34160b273f37724524a6bb34?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4bfae69651a5c93971ff5749599e9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "588d9e82-042a-407b-ab8b-c45d58e5c7c9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ec137622-dfe2-466b-8f13-279b6917dd52"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB453C936F",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E30DF82",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6e30e6bf-b01e-0011-04d4-415005000000",
-      "x-ms-client-request-id" : "588d9e82-042a-407b-ab8b-c45d58e5c7c9",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "e71e6085-d01e-0055-5001-49ca49000000",
+      "x-ms-client-request-id" : "ec137622-dfe2-466b-8f13-279b6917dd52",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4be1a146855a64c9c6accf4891a75?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4bfae32610790792e7329e4033aed?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "865e55fc-b1ca-4106-be2a-30b36df25a68"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ce8c4732-ec65-4445-9646-6e86a4272b97"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB4502FF6C",
-      "x-ms-request-id" : "1b93b547-201e-0013-18d4-41eebd000000",
-      "x-ms-client-request-id" : "865e55fc-b1ca-4106-be2a-30b36df25a68"
+      "eTag" : "0x8D917190DE104D6",
+      "x-ms-request-id" : "10b9e847-f01e-006d-4f01-496e89000000",
+      "x-ms-client-request-id" : "ce8c4732-ec65-4445-9646-6e86a4272b97"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4be1a715028f51095f28b94ce7b24?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4bfae87194655f904250bb412297b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8eada403-80ce-41fb-ae75-d54d11a9c36b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b58883f8-87e8-40aa-bc8a-228ca125d6c6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB4524E976",
-      "x-ms-request-id" : "7d095c99-c01e-0069-07d4-41f3fd000000",
-      "x-ms-client-request-id" : "8eada403-80ce-41fb-ae75-d54d11a9c36b"
+      "eTag" : "0x8D917190E1B09A0",
+      "x-ms-request-id" : "e71e60c7-d01e-0055-0c01-49ca49000000",
+      "x-ms-client-request-id" : "b58883f8-87e8-40aa-bc8a-228ca125d6c6"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4be1a34160b273f37724524a6bb34?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4bfae69651a5c93971ff5749599e9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e54fc21e-a4c0-4654-9bf8-f2af1e3dc71b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e316dd1c-1ead-4f68-90b3-449c0de1e724"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB453C936F",
-      "x-ms-request-id" : "6e30e751-b01e-0011-05d4-415005000000",
-      "x-ms-client-request-id" : "e54fc21e-a4c0-4654-9bf8-f2af1e3dc71b"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=e8123a4b",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c30946c4-7ae3-469b-b71a-b2c0845034a4"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1b93b5d9-201e-0013-1ed4-41eebd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>e8123a4b</Prefix><Containers><Container><Name>e8123a4b1e8123a4be1a146855a64c9c6accf4891a75</Name><Properties><Last-Modified>Wed, 05 May 2021 17:28:59 GMT</Last-Modified><Etag>\"0x8D90FEB4502FF6C\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>e8123a4b2e8123a4be1a715028f51095f28b94ce7b24</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB4524E976\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>e8123a4b3e8123a4be1a34160b273f37724524a6bb34</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB453C936F\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c30946c4-7ae3-469b-b71a-b2c0845034a4",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b1e8123a4be1a146855a64c9c6accf4891a75?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "08f486a1-5280-4315-a95a-779ca0a770ec"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "3db1b37a-801e-0057-7fd4-416482000000",
-      "x-ms-client-request-id" : "08f486a1-5280-4315-a95a-779ca0a770ec",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b2e8123a4be1a715028f51095f28b94ce7b24?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a57bce13-1a19-4962-ab90-d7852cc0c4c5"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "6e30e9f4-b01e-0011-5ad4-415005000000",
-      "x-ms-client-request-id" : "a57bce13-1a19-4962-ab90-d7852cc0c4c5",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e8123a4b3e8123a4be1a34160b273f37724524a6bb34?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "997d9c8e-45f7-4247-a73e-4d523b9fe878"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "51bfff56-e01e-0033-7ed4-41951a000000",
-      "x-ms-client-request-id" : "997d9c8e-45f7-4247-a73e-4d523b9fe878",
-      "Date" : "Wed, 05 May 2021 17:29:01 GMT"
+      "eTag" : "0x8D917190E30DF82",
+      "x-ms-request-id" : "10b9e88e-f01e-006d-1101-496e89000000",
+      "x-ms-client-request-id" : "e316dd1c-1ead-4f68-90b3-449c0de1e724"
     },
     "Exception" : null
   } ],
-  "variables" : [ "e8123a4b0e8123a4be1a267975b2876dbf0b74ccf841", "e8123a4b1e8123a4be1a146855a64c9c6accf4891a75", "e8123a4b2e8123a4be1a715028f51095f28b94ce7b24", "e8123a4b3e8123a4be1a34160b273f37724524a6bb34" ]
+  "variables" : [ "e8123a4b0e8123a4bfae490065e05d5d9d1b74f1691b", "e8123a4b1e8123a4bfae32610790792e7329e4033aed", "e8123a4b2e8123a4bfae87194655f904250bb412297b", "e8123a4b3e8123a4bfae69651a5c93971ff5749599e9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[3].json b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[3].json
index 39d2e6ae424c..f4e53ef2ee12 100644
--- a/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[3].json
+++ b/sdk/storage/azure-storage-blob-nio/src/test/resources/session-records/AzureFileSystemTestCreate[3].json
@@ -1,292 +1,217 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a0e0744941caee72eb1c9428b887?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a9f2313133331e1c28ce64da9a51?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b98b81a7-a1ed-4256-bba5-332be5365b4a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "469fe0be-5ed5-425e-82d8-6ea98314d7b2"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "1b93b376-201e-0013-68d4-41eebd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:1b93b376-201e-0013-68d4-41eebd000000\nTime:2021-05-05T17:28:59.7491242Z</Message></Error>",
-      "x-ms-client-request-id" : "b98b81a7-a1ed-4256-bba5-332be5365b4a",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "e71e5ee3-d01e-0055-6301-49ca49000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:e71e5ee3-d01e-0055-6301-49ca49000000\nTime:2021-05-14T20:44:22.0935131Z</Message></Error>",
+      "x-ms-client-request-id" : "469fe0be-5ed5-425e-82d8-6ea98314d7b2",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a0e0744941caee72eb1c9428b887?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a9f2313133331e1c28ce64da9a51?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ca177d7e-02a5-47d1-81a6-5f242d06de54"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fc32a1a7-53b8-45cf-aaea-2677b1415141"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB4502E40D",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "eTag" : "0x8D917190DE0B7FD",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "7d095b59-c01e-0069-65d4-41f3fd000000",
-      "x-ms-client-request-id" : "ca177d7e-02a5-47d1-81a6-5f242d06de54",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "bf016775-101e-0007-0c01-49b6a1000000",
+      "x-ms-client-request-id" : "fc32a1a7-53b8-45cf-aaea-2677b1415141",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a9f2373375ebd1422951447fab8f?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "05ecbca6-eb30-41b8-a90e-519e3b464500"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3e3dcd36-1cb6-46d1-a315-933576d20c6a"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "7d095bc5-c01e-0069-49d4-41f3fd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:7d095bc5-c01e-0069-49d4-41f3fd000000\nTime:2021-05-05T17:29:00.0635405Z</Message></Error>",
-      "x-ms-client-request-id" : "05ecbca6-eb30-41b8-a90e-519e3b464500",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "10b9e7c9-f01e-006d-6201-496e89000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:10b9e7c9-f01e-006d-6201-496e89000000\nTime:2021-05-14T20:44:22.7265806Z</Message></Error>",
+      "x-ms-client-request-id" : "3e3dcd36-1cb6-46d1-a315-933576d20c6a",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a9f2373375ebd1422951447fab8f?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0b811bf9-9edc-41c7-b31f-9939b99bdb41"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3db40bb8-8dd4-4236-86de-14fab28adaaf"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB45242D9E",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E1ABE4C",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "7d095c05-c01e-0069-03d4-41f3fd000000",
-      "x-ms-client-request-id" : "0b811bf9-9edc-41c7-b31f-9939b99bdb41",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
+      "x-ms-request-id" : "bf016819-101e-0007-1901-49b6a1000000",
+      "x-ms-client-request-id" : "3db40bb8-8dd4-4236-86de-14fab28adaaf",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a0e05596351339426d344488d8fa?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a9f21931956931b32f4e24407a25?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a16d47cc-6ed0-47f5-8929-b6a0c0baaf9d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f83f6cdc-414f-49d7-bf49-8beb948507f5"
     },
     "Response" : {
       "content-length" : "225",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "ContainerNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "6e30e685-b01e-0011-56d4-415005000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:6e30e685-b01e-0011-56d4-415005000000\nTime:2021-05-05T17:29:00.2154275Z</Message></Error>",
-      "x-ms-client-request-id" : "a16d47cc-6ed0-47f5-8929-b6a0c0baaf9d",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "x-ms-request-id" : "10b9e814-f01e-006d-2801-496e89000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The specified container does not exist.\nRequestId:10b9e814-f01e-006d-2801-496e89000000\nTime:2021-05-14T20:44:22.8566736Z</Message></Error>",
+      "x-ms-client-request-id" : "f83f6cdc-414f-49d7-bf49-8beb948507f5",
+      "Date" : "Fri, 14 May 2021 20:44:21 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a0e05596351339426d344488d8fa?restype=container&sv=2020-08-04&ss=b&srt=c&se=2021-05-07T17%3A28%3A57Z&sp=rwdlc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a9f21931956931b32f4e24407a25?restype=container&sv=2020-10-02&ss=b&srt=c&se=2021-05-16T20%3A44%3A19Z&sp=rwdlc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a085e93a-a6ab-4dd9-8553-b09d0ed429a5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-blob-nio/12.0.0-beta.7 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "45e344f8-6602-4b73-89c9-9c029bd52edf"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEB453AE676",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "eTag" : "0x8D917190E30BB52",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1b93b512-201e-0013-6bd4-41eebd000000",
-      "x-ms-client-request-id" : "a085e93a-a6ab-4dd9-8553-b09d0ed429a5",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT"
+      "x-ms-request-id" : "bf016861-101e-0007-5a01-49b6a1000000",
+      "x-ms-client-request-id" : "45e344f8-6602-4b73-89c9-9c029bd52edf",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a0e0744941caee72eb1c9428b887?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a9f2313133331e1c28ce64da9a51?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2410e261-c07a-41e3-97f2-e95991c8c524"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "77aa4231-febb-4541-a67d-22ddc4ae36a3"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB4502E40D",
-      "x-ms-request-id" : "7d095c60-c01e-0069-56d4-41f3fd000000",
-      "x-ms-client-request-id" : "2410e261-c07a-41e3-97f2-e95991c8c524"
+      "eTag" : "0x8D917190DE0B7FD",
+      "x-ms-request-id" : "e71e6099-d01e-0055-6101-49ca49000000",
+      "x-ms-client-request-id" : "77aa4231-febb-4541-a67d-22ddc4ae36a3"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a9f2373375ebd1422951447fab8f?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a54793ff-b618-4066-819d-f8266c6675e7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "56123170-de2e-4c68-821e-82335b6f80c0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB45242D9E",
-      "x-ms-request-id" : "6e30e719-b01e-0011-54d4-415005000000",
-      "x-ms-client-request-id" : "a54793ff-b618-4066-819d-f8266c6675e7"
+      "eTag" : "0x8D917190E1ABE4C",
+      "x-ms-request-id" : "bf016891-101e-0007-0501-49b6a1000000",
+      "x-ms-client-request-id" : "56123170-de2e-4c68-821e-82335b6f80c0"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a0e05596351339426d344488d8fa?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a9f21931956931b32f4e24407a25?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "db5c2379-84cd-4268-8a21-9cab6eff33e8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5d3a9d75-a194-4b33-861f-a2340787a546"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:29:00 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:44:22 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:28:59 GMT",
+      "Date" : "Fri, 14 May 2021 20:44:22 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEB453AE676",
-      "x-ms-request-id" : "1b93b5a1-201e-0013-6cd4-41eebd000000",
-      "x-ms-client-request-id" : "db5c2379-84cd-4268-8a21-9cab6eff33e8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=f1090b0a",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "25548435-e633-4083-8f58-f51dd6f17c54"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "3db1b351-801e-0057-5cd4-416482000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>f1090b0a</Prefix><Containers><Container><Name>f1090b0a1f1090b0a0e0744941caee72eb1c9428b887</Name><Properties><Last-Modified>Wed, 05 May 2021 17:28:59 GMT</Last-Modified><Etag>\"0x8D90FEB4502E40D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB45242D9E\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>f1090b0a3f1090b0a0e05596351339426d344488d8fa</Name><Properties><Last-Modified>Wed, 05 May 2021 17:29:00 GMT</Last-Modified><Etag>\"0x8D90FEB453AE676\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "25548435-e633-4083-8f58-f51dd6f17c54",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a1f1090b0a0e0744941caee72eb1c9428b887?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bec0bc57-6ebd-4bd4-8604-435097c6c124"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "7d095d12-c01e-0069-78d4-41f3fd000000",
-      "x-ms-client-request-id" : "bec0bc57-6ebd-4bd4-8604-435097c6c124",
-      "Date" : "Wed, 05 May 2021 17:29:01 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5a9cd7c7-6a0d-414b-9783-4f7a6f06918b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "3db1b4d0-801e-0057-27d4-416482000000",
-      "x-ms-client-request-id" : "5a9cd7c7-6a0d-414b-9783-4f7a6f06918b",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f1090b0a3f1090b0a0e05596351339426d344488d8fa?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5287da98-10e0-45d2-a8c0-5b13ca554a66"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1b93b83e-201e-0013-4dd4-41eebd000000",
-      "x-ms-client-request-id" : "5287da98-10e0-45d2-a8c0-5b13ca554a66",
-      "Date" : "Wed, 05 May 2021 17:29:00 GMT"
+      "eTag" : "0x8D917190E30BB52",
+      "x-ms-request-id" : "e71e60f2-d01e-0055-3401-49ca49000000",
+      "x-ms-client-request-id" : "5d3a9d75-a194-4b33-861f-a2340787a546"
     },
     "Exception" : null
   } ],
-  "variables" : [ "f1090b0a0f1090b0a0e0394980969982c78404cf4bdc", "f1090b0a1f1090b0a0e0744941caee72eb1c9428b887", "f1090b0a2f1090b0a0e023589fb01e8d1188747d28f0", "f1090b0a3f1090b0a0e05596351339426d344488d8fa", "2021-05-05T17:28:57.490795400Z" ]
+  "variables" : [ "f1090b0a0f1090b0a9f218572b2e73f58362541f3bb8", "f1090b0a1f1090b0a9f2313133331e1c28ce64da9a51", "f1090b0a2f1090b0a9f2373375ebd1422951447fab8f", "f1090b0a3f1090b0a9f21931956931b32f4e24407a25", "2021-05-14T20:44:19.750281400Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
index 6727044692a2..4b4fb4ecbecd 100644
--- a/sdk/storage/azure-storage-blob/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.12.0-beta.2 (Unreleased)
-
+- Added support for the 2020-10-02 service version.
 
 ## 12.12.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
index bf9dae1986c6..bfe0d4b5b3e7 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
@@ -15,7 +15,8 @@ public enum BlobServiceVersion implements ServiceVersion {
     V2020_02_10("2020-02-10"),
     V2020_04_08("2020-04-08"),
     V2020_06_12("2020-06-12"),
-    V2020_08_04("2020-08-04");
+    V2020_08_04("2020-08-04"),
+    V2020_10_02("2020-10-02");
 
     private final String version;
 
@@ -37,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link BlobServiceVersion}
      */
     public static BlobServiceVersion getLatest() {
-        return V2020_08_04;
+        return V2020_10_02;
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasServiceVersion.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasServiceVersion.java
index de955f985fed..50ff2d6b161d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasServiceVersion.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasServiceVersion.java
@@ -15,7 +15,8 @@ public enum BlobSasServiceVersion implements ServiceVersion {
     V2020_02_10("2020-02-10"),
     V2020_04_08("2020-04-08"),
     V2020_06_12("2020-06-12"),
-    V2020_08_04("2020-08-04");
+    V2020_08_04("2020-08-04"),
+    V2020_10_02("2020-10-02");
 
     private final String version;
 
@@ -37,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link BlobSasServiceVersion}
      */
     public static BlobSasServiceVersion getLatest() {
-        return V2020_08_04;
+        return V2020_10_02;
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobDeleteFails.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobDeleteFails.json
index 49a89b5335c7..494ac181f42d 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobDeleteFails.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobDeleteFails.json
@@ -1,112 +1,73 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b90d5510219e90582db2247cd8d5?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "87c14079-ae75-4f17-b9ac-f18fc1a34851"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2ca1213b-1778-4af7-a49d-c1c6c363cc1d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5ADDBE8B",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "eTag" : "0x8D9171686A90CE4",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630be68-c01e-001b-78d7-41f4b2000000",
-      "x-ms-client-request-id" : "87c14079-ae75-4f17-b9ac-f18fc1a34851",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT"
+      "x-ms-request-id" : "49ad379e-601e-008b-75ff-48deaf000000",
+      "x-ms-client-request-id" : "2ca1213b-1778-4af7-a49d-c1c6c363cc1d",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7/f8c4e90b1f8c4e90b77d90837e9325c6f064c46aeb0c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b90d5510219e90582db2247cd8d5/f8c4e90b1f8c4e90b90d07552d3ea37e2679744fabbb",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3909b0a1-2740-47e1-b837-205f37de2342",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "116dd15d-3866-49ef-8eb5-eba639ab6847",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4420526Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE5AEA0769",
-      "x-ms-request-id" : "e630be8d-c01e-001b-15d7-41f4b2000000",
-      "x-ms-client-request-id" : "3909b0a1-2740-47e1-b837-205f37de2342"
+      "eTag" : "0x8D91716872FEE2E",
+      "x-ms-request-id" : "02574f98-b01e-0088-70ff-483fcb000000",
+      "x-ms-client-request-id" : "116dd15d-3866-49ef-8eb5-eba639ab6847"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7/f8c4e90b1f8c4e90b77d90837e9325c6f064c46aeb0c?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A05Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b90d5510219e90582db2247cd8d5/f8c4e90b1f8c4e90b90d07552d3ea37e2679744fabbb?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "db0d9ec2-3081-40dd-a3d4-c92c84517241"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bb6df2fc-593c-434e-811f-839d41025b0b"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630becd-c01e-001b-3ed7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630becd-c01e-001b-3ed7-41f4b2000000\nTime:2021-05-05T17:51:05.2521869Z</Message></Error>",
-      "x-ms-client-request-id" : "db0d9ec2-3081-40dd-a3d4-c92c84517241",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT",
+      "x-ms-request-id" : "a1f885b1-e01e-005e-64ff-483122000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:a1f885b1-e01e-005e-64ff-483122000000\nTime:2021-05-14T20:26:17.8575050Z</Message></Error>",
+      "x-ms-client-request-id" : "bb6df2fc-593c-434e-811f-839d41025b0b",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=f8c4e90b",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "17c1997d-85d5-441f-9168-ec00a151e6a9"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630beec-c01e-001b-52d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>f8c4e90b</Prefix><Containers><Container><Name>f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:05 GMT</Last-Modified><Etag>\"0x8D90FEE5ADDBE8B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "17c1997d-85d5-441f-9168-ec00a151e6a9",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bad7dac0-d93a-4014-a7ad-eadbada3a733"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630bf08-c01e-001b-66d7-41f4b2000000",
-      "x-ms-client-request-id" : "bad7dac0-d93a-4014-a7ad-eadbada3a733",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "f8c4e90b0f8c4e90b77d40571a3a60ece3df1453cbc7", "f8c4e90b1f8c4e90b77d90837e9325c6f064c46aeb0c", "2021-05-05T17:51:05.350624Z" ]
+  "variables" : [ "f8c4e90b0f8c4e90b90d5510219e90582db2247cd8d5", "f8c4e90b1f8c4e90b90d07552d3ea37e2679744fabbb", "2021-05-14T20:26:17.553689Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobRead.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobRead.json
index 7112820762a9..26048c17c773 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobRead.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasBlobRead.json
@@ -1,121 +1,84 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a897207663189c58409a274c298b3?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a87f777925595ac172eb92432b967?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "15a08237-37bd-45a8-8316-61ecd88a9205"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cd4b8c83-0c38-4cbc-8cfc-e2b0d9843d36"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE594C26D9",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:02 GMT",
+      "eTag" : "0x8D9171686A9241E",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630ba98-c01e-001b-64d7-41f4b2000000",
-      "x-ms-client-request-id" : "15a08237-37bd-45a8-8316-61ecd88a9205",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT"
+      "x-ms-request-id" : "48752ede-701e-0011-11ff-484076000000",
+      "x-ms-client-request-id" : "cd4b8c83-0c38-4cbc-8cfc-e2b0d9843d36",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a897207663189c58409a274c298b3/be23d5a81be23d5a8972928219b48a395cf2f4730808",
+    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a87f777925595ac172eb92432b967/be23d5a81be23d5a87f784165ec3b6cdb5cf544f9abc",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b9d67183-55e6-4fcb-8bed-09065917377c",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "54acbe3f-3fa9-4044-b97b-5980d5999e12",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:02 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1608531Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE59589664",
-      "x-ms-request-id" : "e630babb-c01e-001b-01d7-41f4b2000000",
-      "x-ms-client-request-id" : "b9d67183-55e6-4fcb-8bed-09065917377c"
+      "eTag" : "0x8D91716870505D3",
+      "x-ms-request-id" : "8fc45866-e01e-0013-29ff-48fece000000",
+      "x-ms-client-request-id" : "54acbe3f-3fa9-4044-b97b-5980d5999e12"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a897207663189c58409a274c298b3/be23d5a81be23d5a8972928219b48a395cf2f4730808?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a87f777925595ac172eb92432b967/be23d5a81be23d5a87f784165ec3b6cdb5cf544f9abc?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "40a74141-377e-4055-a0e2-d088159d669a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6e5e4c94-f273-481b-8880-d7d9312b207a"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:02 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:02 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1608531Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:02 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:02 GMT",
-      "eTag" : "0x8D90FEE59589664",
-      "x-ms-request-id" : "e630bad2-c01e-001b-15d7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716870505D3",
+      "x-ms-request-id" : "6b1506cf-f01e-0089-76ff-486017000000",
       "Body" : "ZGVmYXVsdA==",
-      "x-ms-client-request-id" : "40a74141-377e-4055-a0e2-d088159d669a",
+      "x-ms-client-request-id" : "6e5e4c94-f273-481b-8880-d7d9312b207a",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=be23d5a8",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "30db4e00-d920-487a-bf08-9ab746d855db"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630baf3-c01e-001b-2fd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>be23d5a8</Prefix><Containers><Container><Name>be23d5a80be23d5a897207663189c58409a274c298b3</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:02 GMT</Last-Modified><Etag>\"0x8D90FEE594C26D9\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "30db4e00-d920-487a-bf08-9ab746d855db",
-      "Date" : "Wed, 05 May 2021 17:51:02 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/be23d5a80be23d5a897207663189c58409a274c298b3?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ac9012e2-2031-4014-98e3-ca9911392fa8"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630bb05-c01e-001b-3dd7-41f4b2000000",
-      "x-ms-client-request-id" : "ac9012e2-2031-4014-98e3-ca9911392fa8",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "be23d5a80be23d5a897207663189c58409a274c298b3", "be23d5a81be23d5a8972928219b48a395cf2f4730808", "2021-05-05T17:51:02.709431700Z" ]
+  "variables" : [ "be23d5a80be23d5a87f777925595ac172eb92432b967", "be23d5a81be23d5a87f784165ec3b6cdb5cf544f9abc", "2021-05-14T20:26:17.314689200Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerFails.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerFails.json
index 4065f2b49413..953804ae25ef 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerFails.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerFails.json
@@ -1,112 +1,73 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e807bd208e8fea805376e6fdc4752264a73bf1?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e807bd208e8fd877342f4269e96d16746b5b3a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "de810c2b-d636-4e4e-b13e-04e067a3c94b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "55d84554-ab86-43d1-a241-2efdb3d965d4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5B1D6B33",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "eTag" : "0x8D9171686A91E7A",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630bf4a-c01e-001b-19d7-41f4b2000000",
-      "x-ms-client-request-id" : "de810c2b-d636-4e4e-b13e-04e067a3c94b",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT"
+      "x-ms-request-id" : "8fc45764-e01e-0013-43ff-48fece000000",
+      "x-ms-client-request-id" : "55d84554-ab86-43d1-a241-2efdb3d965d4",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e807bd208e8fea805376e6fdc4752264a73bf1/7bd208e817bd208e8fea911450160842edf454807998",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e807bd208e8fd877342f4269e96d16746b5b3a/7bd208e817bd208e8fd8718733dc1c12289104faf9e9",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f5cdbfe1-1f3d-4b43-9afe-3d7f47e597f8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8d437569-6273-4c58-b264-b7bea8dcdb73",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4560630Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:04 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE5B29DB3E",
-      "x-ms-request-id" : "e630bf75-c01e-001b-3cd7-41f4b2000000",
-      "x-ms-client-request-id" : "f5cdbfe1-1f3d-4b43-9afe-3d7f47e597f8"
+      "eTag" : "0x8D9171687321176",
+      "x-ms-request-id" : "2290b5d4-d01e-0037-4bff-48086e000000",
+      "x-ms-client-request-id" : "8d437569-6273-4c58-b264-b7bea8dcdb73"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e827bd208e8fea196258251e9547d344264807?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A05Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e827bd208e8fd8907271a3be2fe68804774bdb?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7d76097c-b9fd-4913-81d6-f863f18889f8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c75e7bdb-773b-4387-9827-a34ffccc92d1"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630bfab-c01e-001b-65d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630bfab-c01e-001b-65d7-41f4b2000000\nTime:2021-05-05T17:51:05.6514705Z</Message></Error>",
-      "x-ms-client-request-id" : "7d76097c-b9fd-4913-81d6-f863f18889f8",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT",
+      "x-ms-request-id" : "a1f88586-e01e-005e-42ff-483122000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:a1f88586-e01e-005e-42ff-483122000000\nTime:2021-05-14T20:26:17.7284123Z</Message></Error>",
+      "x-ms-client-request-id" : "c75e7bdb-773b-4387-9827-a34ffccc92d1",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=7bd208e8",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2d6c74e2-dc27-43bf-a0a7-b1b85a835727"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630bfdc-c01e-001b-0fd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>7bd208e8</Prefix><Containers><Container><Name>7bd208e807bd208e8fea805376e6fdc4752264a73bf1</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:05 GMT</Last-Modified><Etag>\"0x8D90FEE5B1D6B33\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2d6c74e2-dc27-43bf-a0a7-b1b85a835727",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7bd208e807bd208e8fea805376e6fdc4752264a73bf1?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7d1789e1-8d0b-49df-b150-53175bd906ae"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c012-c01e-001b-3cd7-41f4b2000000",
-      "x-ms-client-request-id" : "7d1789e1-8d0b-49df-b150-53175bd906ae",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "7bd208e807bd208e8fea805376e6fdc4752264a73bf1", "7bd208e817bd208e8fea911450160842edf454807998", "2021-05-05T17:51:05.758743300Z", "7bd208e827bd208e8fea196258251e9547d344264807" ]
+  "variables" : [ "7bd208e807bd208e8fd877342f4269e96d16746b5b3a", "7bd208e817bd208e8fd8718733dc1c12289104faf9e9", "2021-05-14T20:26:17.570686700Z", "7bd208e827bd208e8fd8907271a3be2fe68804774bdb" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerSucceeds.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerSucceeds.json
index 00684800cbea..42181068c847 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerSucceeds.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasCreateContainerSucceeds.json
@@ -1,130 +1,72 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0908f46dd0952c295577a5b43253dc547c9b86?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0908f46dd09c5e97913a1677c1a6d8b4196a00?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "65eab26c-0734-4ed8-ad33-1e3dc0e187e5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d066c584-cfbd-4ea6-8e3c-31619f1e1c72"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5B59E2F9",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "eTag" : "0x8D9171686A92012",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630c037-c01e-001b-5ad7-41f4b2000000",
-      "x-ms-client-request-id" : "65eab26c-0734-4ed8-ad33-1e3dc0e187e5",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT"
+      "x-ms-request-id" : "5ace6f38-b01e-000e-65ff-48f372000000",
+      "x-ms-client-request-id" : "d066c584-cfbd-4ea6-8e3c-31619f1e1c72",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0908f46dd0952c295577a5b43253dc547c9b86/8f46dd0918f46dd0952c4505500dab92564a04a589f6",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0908f46dd09c5e97913a1677c1a6d8b4196a00/8f46dd0918f46dd09c5e844720b22a90cb3a64acab8e",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1d0e9156-19c7-4aaf-8630-cb9dcf93466e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "19d41728-cfa8-4521-9e1d-65b9c1c8ae7f",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.5030962Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE5B66A15D",
-      "x-ms-request-id" : "e630c05b-c01e-001b-76d7-41f4b2000000",
-      "x-ms-client-request-id" : "1d0e9156-19c7-4aaf-8630-cb9dcf93466e"
+      "eTag" : "0x8D917168739179D",
+      "x-ms-request-id" : "a1f88538-e01e-005e-7dff-483122000000",
+      "x-ms-client-request-id" : "19d41728-cfa8-4521-9e1d-65b9c1c8ae7f"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0928f46dd0952c444086a58c909d4344d26971?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A06Z&sp=rc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0928f46dd09c5e141016f9a64f49adc44d3a13?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2b22bbe0-37d9-4e49-ba4d-6ac33ba94675"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d73f7713-2bc6-4cda-a47c-22a736177a03"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5B729F95",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:06 GMT",
+      "eTag" : "0x8D91716877177D5",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630c076-c01e-001b-0ad7-41f4b2000000",
-      "x-ms-client-request-id" : "2b22bbe0-37d9-4e49-ba4d-6ac33ba94675",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=8f46dd09",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "596a1a99-9cac-4f76-93d8-5843573458a9"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630c0a4-c01e-001b-2bd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>8f46dd09</Prefix><Containers><Container><Name>8f46dd0908f46dd0952c295577a5b43253dc547c9b86</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:05 GMT</Last-Modified><Etag>\"0x8D90FEE5B59E2F9\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>8f46dd0928f46dd0952c444086a58c909d4344d26971</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:06 GMT</Last-Modified><Etag>\"0x8D90FEE5B729F95\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "596a1a99-9cac-4f76-93d8-5843573458a9",
-      "Date" : "Wed, 05 May 2021 17:51:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0908f46dd0952c295577a5b43253dc547c9b86?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5bd3b43c-6ff6-4c0a-8902-013f74bd8995"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c0d1-c01e-001b-4ed7-41f4b2000000",
-      "x-ms-client-request-id" : "5bd3b43c-6ff6-4c0a-8902-013f74bd8995",
-      "Date" : "Wed, 05 May 2021 17:51:07 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f46dd0928f46dd0952c444086a58c909d4344d26971?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "05882733-d22a-44f5-8088-839e70d9bfd7"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c51a-c01e-001b-68d7-41f4b2000000",
-      "x-ms-client-request-id" : "05882733-d22a-44f5-8088-839e70d9bfd7",
-      "Date" : "Wed, 05 May 2021 17:51:07 GMT"
+      "x-ms-request-id" : "2290b698-d01e-0037-80ff-48086e000000",
+      "x-ms-client-request-id" : "d73f7713-2bc6-4cda-a47c-22a736177a03",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "8f46dd0908f46dd0952c295577a5b43253dc547c9b86", "8f46dd0918f46dd0952c4505500dab92564a04a589f6", "2021-05-05T17:51:06.155842400Z", "8f46dd0928f46dd0952c444086a58c909d4344d26971" ]
+  "variables" : [ "8f46dd0908f46dd09c5e97913a1677c1a6d8b4196a00", "8f46dd0918f46dd09c5e844720b22a90cb3a64acab8e", "2021-05-14T20:26:17.642687200Z", "8f46dd0928f46dd09c5e141016f9a64f49adc44d3a13" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasFilterTagsFail.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasFilterTagsFail.json
index 144a00dec008..556e7122128b 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasFilterTagsFail.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasFilterTagsFail.json
@@ -1,112 +1,73 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3cc8cb6203cc8cb62b0f37944a71e7efb1acb4a1c9a3?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3cc8cb6203cc8cb62f8b03590227bf470032c4435bd5?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a358e4ee-25ef-4bfb-9f30-f90c7668e7f5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d32a5aba-0180-4880-822c-f41495f50e1a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE590FAF0D",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:02 GMT",
+      "eTag" : "0x8D9171686A67403",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630b9b0-c01e-001b-25d7-41f4b2000000",
-      "x-ms-client-request-id" : "a358e4ee-25ef-4bfb-9f30-f90c7668e7f5",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT"
+      "x-ms-request-id" : "a92db4b8-101e-0081-03ff-487a18000000",
+      "x-ms-client-request-id" : "d32a5aba-0180-4880-822c-f41495f50e1a",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3cc8cb6203cc8cb62b0f37944a71e7efb1acb4a1c9a3/3cc8cb6213cc8cb62b0f6489254aea4bf917b4f93a13",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3cc8cb6203cc8cb62f8b03590227bf470032c4435bd5/3cc8cb6213cc8cb62f8b285255d599be899be43bb9df",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "df3c83fd-d974-4ca1-8bef-045f4a94d663",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a5da3609-17e9-495a-853c-31f19baef3ed",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:02 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3109602Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE591C1E91",
-      "x-ms-request-id" : "e630b9e8-c01e-001b-54d7-41f4b2000000",
-      "x-ms-client-request-id" : "df3c83fd-d974-4ca1-8bef-045f4a94d663"
+      "eTag" : "0x8D91716871BED62",
+      "x-ms-request-id" : "acc1242c-e01e-0095-44ff-483277000000",
+      "x-ms-client-request-id" : "a5da3609-17e9-495a-853c-31f19baef3ed"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=blobs&where=%22foo%22%3D%27bar%27&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A02Z&sp=rwdxlacup&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?comp=blobs&where=%22foo%22%3D%27bar%27&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rwdxlacup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f3aad9d6-2173-4720-842f-810a8296d57c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6a6660e6-3dd8-45f0-85c7-9a313f836345"
     },
     "Response" : {
       "content-length" : "280",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630ba1f-c01e-001b-7fd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630ba1f-c01e-001b-7fd7-41f4b2000000\nTime:2021-05-05T17:51:02.2050135Z</Message></Error>",
-      "x-ms-client-request-id" : "f3aad9d6-2173-4720-842f-810a8296d57c",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
+      "x-ms-request-id" : "5de8205a-a01e-003d-3aff-48acd9000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:5de8205a-a01e-003d-3aff-48acd9000000\nTime:2021-05-14T20:26:17.6706613Z</Message></Error>",
+      "x-ms-client-request-id" : "6a6660e6-3dd8-45f0-85c7-9a313f836345",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=3cc8cb62",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b4735cf6-abfe-4f84-9681-e7141d302008"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630ba43-c01e-001b-19d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>3cc8cb62</Prefix><Containers><Container><Name>3cc8cb6203cc8cb62b0f37944a71e7efb1acb4a1c9a3</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:02 GMT</Last-Modified><Etag>\"0x8D90FEE590FAF0D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "b4735cf6-abfe-4f84-9681-e7141d302008",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3cc8cb6203cc8cb62b0f37944a71e7efb1acb4a1c9a3?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4b468af1-d7e8-400b-ba15-d88200c401d6"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630ba6b-c01e-001b-3ad7-41f4b2000000",
-      "x-ms-client-request-id" : "4b468af1-d7e8-400b-ba15-d88200c401d6",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "3cc8cb6203cc8cb62b0f37944a71e7efb1acb4a1c9a3", "3cc8cb6213cc8cb62b0f6489254aea4bf917b4f93a13", "2021-05-05T17:51:02.314766100Z" ]
+  "variables" : [ "3cc8cb6203cc8cb62f8b03590227bf470032c4435bd5", "3cc8cb6213cc8cb62f8b285255d599be899be43bb9df", "2021-05-14T20:26:17.438685900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[0].json
index 23e6db914777..f7446cce8e48 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[0].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[0].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fd9eeac07fd9eeac293703439ac09794ff174927b68?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fd9eeac07fd9eeac64f1097874986c9d56b840fba2f?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d659b85d-5fed-40ac-b143-fc150b477941"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d235305a-965e-47dc-b35d-c3a904fbc362"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538645C6B8",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:45 GMT",
+      "eTag" : "0x8D9171686A67432",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "80c6a8df-b01e-0073-773c-419222000000",
-      "x-ms-client-request-id" : "d659b85d-5fed-40ac-b143-fc150b477941",
-      "Date" : "Tue, 04 May 2021 23:22:45 GMT"
+      "x-ms-request-id" : "3963a7d0-101e-004a-49ff-48794d000000",
+      "x-ms-client-request-id" : "d235305a-965e-47dc-b35d-c3a904fbc362",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fd9eeac07fd9eeac293703439ac09794ff174927b68/7fd9eeac17fd9eeac293178910afcf826bb3943d4b77",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fd9eeac07fd9eeac64f1097874986c9d56b840fba2f/7fd9eeac17fd9eeac64f18927773dfd1a0da14a76ae9",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c4a4b3bc-cb11-41ec-94d9-46ba9061f7ab",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f55e7897-0671-42bf-b0bd-061eb4e84f37",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:46 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4150332Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F5386976A32",
-      "x-ms-request-id" : "7e5e874e-d01e-0075-3f3c-41a19d000000",
-      "x-ms-client-request-id" : "c4a4b3bc-cb11-41ec-94d9-46ba9061f7ab"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=7fd9eeac",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "73811543-8283-4928-abb1-42c03a9077a1"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "9e5a5d51-001e-0059-283c-414d32000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>7fd9eeac</Prefix><Containers><Container><Name>7fd9eeac07fd9eeac293703439ac09794ff174927b68</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:45 GMT</Last-Modified><Etag>\"0x8D90F538645C6B8\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "73811543-8283-4928-abb1-42c03a9077a1",
-      "Date" : "Tue, 04 May 2021 23:22:45 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fd9eeac07fd9eeac293703439ac09794ff174927b68?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8f68c90e-991c-45c7-95e3-f6fb5ad44ebe"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "a671c88c-601e-0070-033c-417346000000",
-      "x-ms-client-request-id" : "8f68c90e-991c-45c7-95e3-f6fb5ad44ebe",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT"
+      "eTag" : "0x8D91716872BCEBC",
+      "x-ms-request-id" : "8fc458a9-e01e-0013-63ff-48fece000000",
+      "x-ms-client-request-id" : "f55e7897-0671-42bf-b0bd-061eb4e84f37"
     },
     "Exception" : null
   } ],
-  "variables" : [ "7fd9eeac07fd9eeac293703439ac09794ff174927b68", "7fd9eeac17fd9eeac293178910afcf826bb3943d4b77" ]
+  "variables" : [ "7fd9eeac07fd9eeac64f1097874986c9d56b840fba2f", "7fd9eeac17fd9eeac64f18927773dfd1a0da14a76ae9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[1].json
index 5e164b179c16..9b0b4af54f7f 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[1].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[1].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/66c2dfed066c2dfede3c87645cc96ac2eacb04df6916?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/66c2dfed066c2dfed7e39094257f5e3999b06470d9a9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "23e3b1bf-5a51-46fe-9997-866c65605394"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3d6d19d1-f3eb-465d-a0a2-20d601cbf929"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F5386D1155B",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:46 GMT",
+      "eTag" : "0x8D9171686A9B56C",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f24fa459-701e-000e-733c-41e301000000",
-      "x-ms-client-request-id" : "23e3b1bf-5a51-46fe-9997-866c65605394",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT"
+      "x-ms-request-id" : "6b1505bf-f01e-0089-1dff-486017000000",
+      "x-ms-client-request-id" : "3d6d19d1-f3eb-465d-a0a2-20d601cbf929",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/66c2dfed066c2dfede3c87645cc96ac2eacb04df6916/66c2dfed166c2dfede3c28366751cd59057384238967",
+    "Uri" : "https://REDACTED.blob.core.windows.net/66c2dfed066c2dfed7e39094257f5e3999b06470d9a9/66c2dfed166c2dfed7e32394899f3e5c2e10b4a468c1",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "988c08e7-f79c-4ccf-a534-6941f46f6c41",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "91b34f08-e362-4f24-9c99-16960d4b4f29",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:46 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3099592Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F5386DF2E87",
-      "x-ms-request-id" : "326003df-e01e-0041-593c-419255000000",
-      "x-ms-client-request-id" : "988c08e7-f79c-4ccf-a534-6941f46f6c41"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=66c2dfed",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d463d5d6-0b48-4b7d-8891-4b29f83e49bf"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "27726dc3-401e-0048-7b3c-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>66c2dfed</Prefix><Containers><Container><Name>66c2dfed066c2dfede3c87645cc96ac2eacb04df6916</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:46 GMT</Last-Modified><Etag>\"0x8D90F5386D1155B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "d463d5d6-0b48-4b7d-8891-4b29f83e49bf",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/66c2dfed066c2dfede3c87645cc96ac2eacb04df6916?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8193eca1-cfc7-49e7-9f6c-76f286f098a2"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "2824ce98-401e-003a-0e3c-41d0c9000000",
-      "x-ms-client-request-id" : "8193eca1-cfc7-49e7-9f6c-76f286f098a2",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT"
+      "eTag" : "0x8D91716871BC648",
+      "x-ms-request-id" : "5de8202b-a01e-003d-14ff-48acd9000000",
+      "x-ms-client-request-id" : "91b34f08-e362-4f24-9c99-16960d4b4f29"
     },
     "Exception" : null
   } ],
-  "variables" : [ "66c2dfed066c2dfede3c87645cc96ac2eacb04df6916", "66c2dfed166c2dfede3c28366751cd59057384238967" ]
+  "variables" : [ "66c2dfed066c2dfed7e39094257f5e3999b06470d9a9", "66c2dfed166c2dfed7e32394899f3e5c2e10b4a468c1" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[2].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[2].json
index 526bc20dbbe3..0d1a2579f95b 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[2].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasImplUtilStringToSign[2].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4def8c2e04def8c2e8dd793256d0f8b15b5db496f8ac?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/4def8c2e04def8c2e4ab0307952cf9cee3cf64ea79cb?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7279a35a-caab-4f18-b94a-cd69b7744372"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f08a51cc-af52-427d-bede-a2032f2daa14"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F5387105EF9",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:47 GMT",
+      "eTag" : "0x8D9171686A2E0E8",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "62c6e8e6-201e-0003-2a3c-412bd5000000",
-      "x-ms-client-request-id" : "7279a35a-caab-4f18-b94a-cd69b7744372",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT"
+      "x-ms-request-id" : "bc20dc33-a01e-0070-34ff-486335000000",
+      "x-ms-client-request-id" : "f08a51cc-af52-427d-bede-a2032f2daa14",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4def8c2e04def8c2e8dd793256d0f8b15b5db496f8ac/4def8c2e14def8c2e8dd41371e03d23cbc7364f2da94",
+    "Uri" : "https://REDACTED.blob.core.windows.net/4def8c2e04def8c2e4ab0307952cf9cee3cf64ea79cb/4def8c2e14def8c2e4ab02861e39ac2ffff044000959",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2847ea71-fd47-456c-b752-602d1e9a0db1",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "798c97d2-0c61-445c-84a8-c582259f3ff0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:47 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2068858Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:46 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F53871CB7CC",
-      "x-ms-request-id" : "cd53b671-c01e-001b-3f3c-41f4b2000000",
-      "x-ms-client-request-id" : "2847ea71-fd47-456c-b752-602d1e9a0db1"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=4def8c2e",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ad3be3d4-9661-4ad4-a608-74deb5202592"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "160bc61f-d01e-004a-413c-41693e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>4def8c2e</Prefix><Containers><Container><Name>4def8c2e04def8c2e8dd793256d0f8b15b5db496f8ac</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:47 GMT</Last-Modified><Etag>\"0x8D90F5387105EF9\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ad3be3d4-9661-4ad4-a608-74deb5202592",
-      "Date" : "Tue, 04 May 2021 23:22:47 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4def8c2e04def8c2e8dd793256d0f8b15b5db496f8ac?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "927bcee3-65b6-4a70-8048-50cbee53f034"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "93bcfed2-f01e-002f-203c-41c77a000000",
-      "x-ms-client-request-id" : "927bcee3-65b6-4a70-8048-50cbee53f034",
-      "Date" : "Tue, 04 May 2021 23:22:48 GMT"
+      "eTag" : "0x8D91716870C0BFA",
+      "x-ms-request-id" : "2290b58b-d01e-0037-09ff-48086e000000",
+      "x-ms-client-request-id" : "798c97d2-0c61-445c-84a8-c582259f3ff0"
     },
     "Exception" : null
   } ],
-  "variables" : [ "4def8c2e04def8c2e8dd793256d0f8b15b5db496f8ac", "4def8c2e14def8c2e8dd41371e03d23cbc7364f2da94" ]
+  "variables" : [ "4def8c2e04def8c2e4ab0307952cf9cee3cf64ea79cb", "4def8c2e14def8c2e4ab02861e39ac2ffff044000959" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasOnEndpoint.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasOnEndpoint.json
index bee1caf5b89e..73f5eb13791f 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasOnEndpoint.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasOnEndpoint.json
@@ -1,182 +1,126 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0946c6800288e22994a4bd9407a905?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0948b124683920306e643654f7a989?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7bcd0944-5a65-4fa1-981b-07c64471598b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bab2c23f-025d-4b7b-a8af-66f210a1f8fc"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5CF73CD5",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:08 GMT",
+      "eTag" : "0x8D9171686A8D141",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630c546-c01e-001b-0dd7-41f4b2000000",
-      "x-ms-client-request-id" : "7bcd0944-5a65-4fa1-981b-07c64471598b",
-      "Date" : "Wed, 05 May 2021 17:51:07 GMT"
+      "x-ms-request-id" : "a1f883d6-e01e-005e-54ff-483122000000",
+      "x-ms-client-request-id" : "bab2c23f-025d-4b7b-a8af-66f210a1f8fc",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0946c6800288e22994a4bd9407a905/9b92e09419b92e0946c6389527457becc22b74895a0d",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0948b124683920306e643654f7a989/9b92e09419b92e0948b16979834cd12d60c114234bc3",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "84ba5da3-928d-4380-8366-22da12967e9a",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fe8eda98-ddcf-4270-a0e4-bdaae002322e",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3059555Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE5D03AD4A",
-      "x-ms-request-id" : "e630c578-c01e-001b-36d7-41f4b2000000",
-      "x-ms-client-request-id" : "84ba5da3-928d-4380-8366-22da12967e9a"
+      "eTag" : "0x8D91716871B29E3",
+      "x-ms-request-id" : "6b1506a1-f01e-0089-4bff-486017000000",
+      "x-ms-client-request-id" : "fe8eda98-ddcf-4270-a0e4-bdaae002322e"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09429b92e0946c6921629bf73f24371e41c1b36?restype=container&sv=2020-08-04&se=2021-05-06T17%3A51%3A08Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09429b92e0948b153944b7a09cf37d7148e6b55?restype=container&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eaea6408-d889-4477-bfde-b522151e6732"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2f9b0d4c-7b05-4c2b-8be5-8876c69aabda"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5D10BCEE",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:08 GMT",
+      "eTag" : "0x8D91716874008F3",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630c59d-c01e-001b-57d7-41f4b2000000",
-      "x-ms-client-request-id" : "eaea6408-d889-4477-bfde-b522151e6732",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT"
+      "x-ms-request-id" : "acc12492-e01e-0095-16ff-483277000000",
+      "x-ms-client-request-id" : "2f9b0d4c-7b05-4c2b-8be5-8876c69aabda",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0946c6800288e22994a4bd9407a905?restype=container&sv=2020-08-04&se=2021-05-06T17%3A51%3A08Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0948b124683920306e643654f7a989?restype=container&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8acd26ea-f206-4be7-93c8-0d61d250dbb6"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "21266559-324a-40dd-bf40-f267d56ac5da"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEE5CF73CD5",
-      "x-ms-request-id" : "e630c5bf-c01e-001b-75d7-41f4b2000000",
-      "x-ms-client-request-id" : "8acd26ea-f206-4be7-93c8-0d61d250dbb6"
+      "eTag" : "0x8D9171686A8D141",
+      "x-ms-request-id" : "48753021-701e-0011-1cff-484076000000",
+      "x-ms-client-request-id" : "21266559-324a-40dd-bf40-f267d56ac5da"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0946c6800288e22994a4bd9407a905/9b92e09419b92e0946c6389527457becc22b74895a0d",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0948b124683920306e643654f7a989/9b92e09419b92e0948b16979834cd12d60c114234bc3",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b263ae6a-92ba-4723-b208-3ba7a403121b",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5cbcb5bd-43f6-4f22-975b-59638cb6e3a4",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-content-crc64" : "yR5+UDjFriM=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:08 GMT",
+      "x-ms-content-crc64" : "y/pJ9D3QwMI=",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.2896540Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
-      "Content-MD5" : "c5vVzO3UFLnng14Tufo1xw==",
-      "eTag" : "0x8D90FEE5D30E015",
-      "x-ms-request-id" : "e630c5f2-c01e-001b-1ed7-41f4b2000000",
-      "x-ms-client-request-id" : "b263ae6a-92ba-4723-b208-3ba7a403121b"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=9b92e094",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "aa60d36c-1404-43e1-b9a0-8dca6a589216"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630c60a-c01e-001b-34d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>9b92e094</Prefix><Containers><Container><Name>9b92e09409b92e0946c6800288e22994a4bd9407a905</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:08 GMT</Last-Modified><Etag>\"0x8D90FEE5CF73CD5\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container><Container><Name>9b92e09429b92e0946c6921629bf73f24371e41c1b36</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:08 GMT</Last-Modified><Etag>\"0x8D90FEE5D10BCEE\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "aa60d36c-1404-43e1-b9a0-8dca6a589216",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09409b92e0946c6800288e22994a4bd9407a905?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d880bf30-a24b-4dfd-b1f6-5e16e95cda32"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c635-c01e-001b-5bd7-41f4b2000000",
-      "x-ms-client-request-id" : "d880bf30-a24b-4dfd-b1f6-5e16e95cda32",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9b92e09429b92e0946c6921629bf73f24371e41c1b36?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d1884fae-76b7-45d6-a7bc-cb9281fc8d00"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c659-c01e-001b-77d7-41f4b2000000",
-      "x-ms-client-request-id" : "d1884fae-76b7-45d6-a7bc-cb9281fc8d00",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT"
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
+      "Content-MD5" : "cvXt15bXmduYp0Dl4ouHHQ==",
+      "eTag" : "0x8D9171687B11C8C",
+      "x-ms-request-id" : "2290b771-d01e-0037-40ff-48086e000000",
+      "x-ms-client-request-id" : "5cbcb5bd-43f6-4f22-975b-59638cb6e3a4"
     },
     "Exception" : null
   } ],
-  "variables" : [ "9b92e09409b92e0946c6800288e22994a4bd9407a905", "9b92e09419b92e0946c6389527457becc22b74895a0d", "2021-05-05T17:51:08.863588500Z", "9b92e09429b92e0946c6921629bf73f24371e41c1b36", "dec7efe0-1870-48b1-8e2c-9a30446a73dc" ]
+  "variables" : [ "9b92e09409b92e0948b124683920306e643654f7a989", "9b92e09419b92e0948b16979834cd12d60c114234bc3", "2021-05-14T20:26:17.409688800Z", "9b92e09429b92e0948b153944b7a09cf37d7148e6b55", "a463f8a9-829d-4e94-afee-84d723fb6a8f" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsAndFilterTags.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsAndFilterTags.json
index d9cc887c104f..8102719d0bf7 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsAndFilterTags.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsAndFilterTags.json
@@ -1,151 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5ee986fd-ebac-4492-a817-af1855403479"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "77648a3d-26f7-445f-b034-ffa2a66b9ca2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE571ECEC3",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:58 GMT",
+      "eTag" : "0x8D9171686A8E00D",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630b405-c01e-001b-1bd7-41f4b2000000",
-      "x-ms-client-request-id" : "5ee986fd-ebac-4492-a817-af1855403479",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT"
+      "x-ms-request-id" : "c1a14d4a-501e-0090-54ff-48e0ac000000",
+      "x-ms-client-request-id" : "77648a3d-26f7-445f-b034-ffa2a66b9ca2",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3/bce4ce531bce4ce532dc0880891479f63a3e54c44bf7",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e/bce4ce531bce4ce533b66307514a3e7eb0b574b4e911",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "02b475b5-a864-4225-a47c-0f6071478737",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ae17ac77-b6c0-482c-b465-51377cdedd86",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:58 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1608531Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE572AC884",
-      "x-ms-request-id" : "e630b425-c01e-001b-35d7-41f4b2000000",
-      "x-ms-client-request-id" : "02b475b5-a864-4225-a47c-0f6071478737"
+      "eTag" : "0x8D91716870505D3",
+      "x-ms-request-id" : "acc123ee-e01e-0095-12ff-483277000000",
+      "x-ms-client-request-id" : "ae17ac77-b6c0-482c-b465-51377cdedd86"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3/bce4ce531bce4ce532dc0880891479f63a3e54c44bf7?comp=tags&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A50%3A59Z&sp=rwdxlacuptf&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e/bce4ce531bce4ce533b66307514a3e7eb0b574b4e911?comp=tags&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rwdxlacuptf&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5dfeaadb-d7e1-4c6c-a8c3-01ec1aa14d79",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d6ab674e-8901-4413-848a-1f28f003156b",
       "Content-Type" : "application/xml"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "e630b453-c01e-001b-5ed7-41f4b2000000",
-      "x-ms-client-request-id" : "5dfeaadb-d7e1-4c6c-a8c3-01ec1aa14d79",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT"
+      "x-ms-request-id" : "2290b64c-d01e-0037-3aff-48086e000000",
+      "x-ms-client-request-id" : "d6ab674e-8901-4413-848a-1f28f003156b",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3/bce4ce531bce4ce532dc0880891479f63a3e54c44bf7?comp=tags&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A50%3A59Z&sp=rwdxlacuptf&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e/bce4ce531bce4ce533b66307514a3e7eb0b574b4e911?comp=tags&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rwdxlacuptf&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "26323a49-709b-4caa-a9fd-8d69423eacef"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4ea3dc13-99e4-456d-ab6b-2e27fbee300d"
     },
     "Response" : {
       "content-length" : "115",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630b47b-c01e-001b-03d7-41f4b2000000",
+      "x-ms-request-id" : "48753074-701e-0011-5fff-484076000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags>",
-      "x-ms-client-request-id" : "26323a49-709b-4caa-a9fd-8d69423eacef",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT",
+      "x-ms-client-request-id" : "4ea3dc13-99e4-456d-ab6b-2e27fbee300d",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=blobs&where=%22foo%22%3D%27bar%27&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A50%3A59Z&sp=rwdxlacuptf&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?comp=blobs&where=%22foo%22%3D%27bar%27&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rwdxlacuptf&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9341a0a8-7ef7-476a-b7ce-be773f4b9c10"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b16e226f-ffa2-4564-b05a-697e8a5a9726"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630b4ae-c01e-001b-26d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Where>&quot;foo&quot;=&apos;bar&apos;</Where><Blobs><Blob><Name>021a93351021a93356ce201916a1fbad08c4f442697c</Name><ContainerName>021a93350021a93356ce274210aeda276a9454fa2906</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>03475377103475377cef14632309c987498054650ae2</Name><ContainerName>03475377003475377cef49431533a2a535691498081c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>03ac187d103ac187dd3774447a475dcc3a5174b4e83d</Name><ContainerName>03ac187d003ac187dd370981362254d506ccb48d8b74</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>05d956a7105d956a7c49066344d966427c1944dda982</Name><ContainerName>05d956a7005d956a7c4980283aa408442b4fe44cc876</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>0933c0b510933c0b5a4f0767182de89abc9374741b7e</Name><ContainerName>0933c0b500933c0b5a4f80439a1c4e05236c244499e5</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>0a25e67d10a25e67d17990486f059b88890644c0abaf</Name><ContainerName>0a25e67d00a25e67d17948173135d9a4271ee4d229bc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>0af46f7010af46f70bdd2532387b8fa0a9d1149f2a70</Name><ContainerName>0af46f7000af46f70bdd93397f9657aae482c4ee8825</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>0d00515810d005158603299064f6b011221444d33a9c</Name><ContainerName>0d00515800d00515860333882d5fdf5ffafde46cdbfc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>0ee57fda10ee57fda79655481d4e73ba599364336908</Name><ContainerName>0ee57fda00ee57fda7960642913bf93be5d8940999a3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>1028f1f411028f1f47861568043153e16aad1401eb14</Name><ContainerName>1028f1f401028f1f478616546713d30e2301f4e2fa71</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>133ed73c1133ed73cd1592979759fed237e6c4e3cbb8</Name><ContainerName>133ed73c0133ed73cd1541674dfe990068bb4479db46</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>13bf74f2113bf74f20545153727d3ad28b5e34769b15</Name><ContainerName>13bf74f2013bf74f205471249a588b8e19ff44d2daa2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>13ef5e31113ef5e319d12272758b96191bea748f08b7</Name><ContainerName>13ef5e31013ef5e319d1861475987d7558920441e8f6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>141b60191141b60195b8158792d9197e86e3a41149ab</Name><ContainerName>141b60190141b60195b890506a9c6ddfa648e437b97e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>14bc13a3114bc13a325458233ea76783bfe91496eb59</Name><ContainerName>14bc13a3014bc13a3254477769d8bd2d000d64560b8b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>15ecf1ca315ecf1ca61d859051027044dd957462cb14</Name><ContainerName>15ecf1ca215ecf1ca61d98121ccd80f672ab240a8a92</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>1a5c623611a5c6236ba46049166996762bf574928a8f</Name><ContainerName>1a5c623601a5c6236ba495705bdba977cc8804b63965</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>1ab7293c11ab7293c77032237dee3b8afce6347c490e</Name><ContainerName>1ab7293c01ab7293c770687641526a1b1f3044230a16</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>1b01a27411b01a2744a441534343fa0bd23614e29aa8</Name><ContainerName>1b01a27401b01a2744a4121868eb87bccb7fc4d009af</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>1cc267e611cc267e6c6c878390aee123ebb8b46e6b15</Name><ContainerName>1cc267e601cc267e6c6c7527569ec1c7fa5e54fd3b83</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>2108b5be12108b5be11a31647c52e372d28804a2abd7</Name><ContainerName>2108b5be02108b5be11a81421240b8708f84240a0ab2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>21891670121891670181311327d6f632cbaef4b698de</Name><ContainerName>218916700218916701814676435c5fd26915b4713a14</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>21d93cb3121d93cb36f135938a64f5cef29a24697a69</Name><ContainerName>21d93cb3021d93cb36f184268b11614415e70427da60</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>21e94e41121e94e410ab836964b8d8c9c91514debb5f</Name><ContainerName>21e94e41021e94e410ab21831a239affa86dd4ea0beb</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>221e93761221e9376b7a42578bd6f5acd2c2d48a98b8</Name><ContainerName>221e93760221e9376b7a850495f4da761b4c64fbfbca</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>25c82c19125c82c1992563098cbda16b0a3fe4c0eb35</Name><ContainerName>25c82c19025c82c199255584978f7e894efe64928878</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>262d029b1262d029b52859068e0fe9910f3ee4d10817</Name><ContainerName>262d029b0262d029b52897932de72f005faae4d6d937</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>27950ff3127950ff3a60964280080fb2074864b47923</Name><ContainerName>27950ff3027950ff3a60414614a19bd80d70d4549840</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>28814bbe128814bbe2e1446388d29d6da6dcd42578d2</Name><ContainerName>28814bbe028814bbe2e17775532cb9c90269748989f2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>2937c0f612937c0f65bb66358e598b03acd9240b9a17</Name><ContainerName>2937c0f602937c0f65bb3490980f6c613d3ed453aa5e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>2cf954e012cf954e01a9035132cf8d09e5d95454d845</Name><ContainerName>2cf954e002cf954e01a9599550014c74d15e448a0898</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>2e7deff322e7deff331127250536fb824268d4bc99da</Name><ContainerName>2e7deff302e7deff3311946173b56f1cb45df42498c6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>302cf1b71302cf1b7b1e9326246118f8828c54f3d90b</Name><ContainerName>302cf1b70302cf1b7b1e98325f9a968c181a44cf2a56</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>319a7aff1319a7aff2a748893ba4102024ba14b1cbc1</Name><ContainerName>319a7aff0319a7aff2a767239fe250ccf21314f12b37</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>35e265a1135e265a13559926347eacb39f3a146f2af1</Name><ContainerName>35e265a1035e265a1355292649e4f06c982b043cc9af</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>3766deb223766deb2e7a43950ffde380ccb6249bc81e</Name><ContainerName>3766deb203766deb2e7a504137e1de8f735544b57a35</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>37ef3425137ef342541b17996ed35612284dd4276913</Name><ContainerName>37ef3425037ef342541b37434da9ab55166fb4d1fb93</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>381384ff1381384ff8ce46253b09e55508bac4d0e827</Name><ContainerName>381384ff0381384ff8ce678292dd74301243f413da17</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>3892273113892273167674646c8807be0002441d1b88</Name><ContainerName>3892273103892273167673171f57904ac014245e9bbb</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>38c20df2138c20df21b0629415cc6561888674fc7b05</Name><ContainerName>38c20df2038c20df21b056901f6bb9f241521407195d</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>38f27f00138f27f00b7953578fb883de7266341ebba0</Name><ContainerName>38f27f00038f27f00b79966459beb68439a3a42ccb7c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>3b05a23713b05a2377cd222298a844ef28a0e4bd2be7</Name><ContainerName>3b05a23703b05a2377cd4396089cd0d1272094116bc3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>3cd31d5813cd31d582048415978d33e4cc2c54c179d1</Name><ContainerName>3cd31d5803cd31d58204441023e0ce4d7d868416a92c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>3f3633da13f3633da482124194412b43a85104cafa14</Name><ContainerName>3f3633da03f3633da482437501ff1b749cfae4e29b91</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>41a4e91d141a4e91d1401476384010079356d43ef9ca</Name><ContainerName>41a4e91d041a4e91d14078758cb71e282cede487c991</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4241c79f14241c79fb1308166a74bbbfd32e7481cba9</Name><ContainerName>4241c79f04241c79fb1396555e094c905d3d9479d9d2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>45e5d374145e5d37427610738d008d1d1776d4c05ae7</Name><ContainerName>45e5d374045e5d37427613974d195fe273be04858a33</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4672567214672567295578184f5ac6f227c8a4ff59bb</Name><ContainerName>4672567204672567295566126a65083cb07934fd691a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>489591e41489591e4e6e5670468de7df0cc4d43baa02</Name><ContainerName>489591e40489591e4e6e62194f9fe02089363428d913</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4a112af724a112af781795752037f81c8fb864359886</Name><ContainerName>4a112af704a112af781751959f712b4de437747169b1</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4a98c06014a98c060e2842817189384d7115a4336894</Name><ContainerName>4a98c06004a98c060e28330391109446eaede4db88e2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4c06c5b014c06c5b05aa50715a0eb82b17e3e4243b1f</Name><ContainerName>4c06c5b004c06c5b05aa7277715024cb7a7c44a98a6a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4ced8eba14ced8ebaf7188178867f9ce15bc74e2cac4</Name><ContainerName>4ced8eba04ced8ebaf717455977e132010cee4e7abb1</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4d5b05f214d5b05f2673120894e3cf69b3d594d79aba</Name><ContainerName>4d5b05f204d5b05f267392782594f156879b745eba60</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>4dac1de924dac1de9b1b332585eea16f56a6d45b385b</Name><ContainerName>4dac1de904dac1de9b1b00619cfce847e3b11443786e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>518ea0a51518ea0a591c3879228868f6f67c94215a41</Name><ContainerName>518ea0a50518ea0a591c247516fb830a365534bbea5d</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>530a1bb62530a1bb6f9b839163fe68b09592d42348c0</Name><ContainerName>530a1bb60530a1bb6f9b18542be8bc015833744c4adb</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>5383f12115383f121bcd947822eb6f2b4d30e4913944</Name><ContainerName>5383f12105383f121bcd171252aa1f5f20c204efbbba</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>544034b31544034b3bbe28691cfd540916a4340938cf</Name><ContainerName>544034b30544034b3bbe24386ff7789de739c4af2bca</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>551df4f11551df4f1b6305973c5674e73732648bb9d1</Name><ContainerName>551df4f10551df4f1b63583619eaf84101da94bba8b6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>55f6bffb155f6bffbdaa7946193c4bc54e9d940118df</Name><ContainerName>55f6bffb055f6bffbdaa34969aa9b9c6e1e49491eb96</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>5699dd9015699dd9069539435c8c998c3c74e4252872</Name><ContainerName>5699dd9005699dd9069568573e7bc262f262d4d0fa35</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>58bfd85c158bfd85c764122999470d7aeee784200b4e</Name><ContainerName>58bfd85c058bfd85c7645078581c780bf10d44391bd5</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>5b5af6de15b5af6de339007390d1db0a632054697988</Name><ContainerName>5b5af6de05b5af6de3394795472a2f1360cbe472ca73</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>5cfee23515cfee235f4985367079a6e16efc14be297c</Name><ContainerName>5cfee23505cfee235f49161381c5d48ae48b640e1b47</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>5f69673315f696733de1584219e42be5d51dd4bcca89</Name><ContainerName>5f69673305f696733de1908718e13e9cbc7824e2492f</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>613c79342613c7934b7588425b7d5a0d8d95c46feb3d</Name><ContainerName>613c79340613c7934b7504339acb5f4c072da4b13b54</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>61b593a3161b593a32eb3936325bd394ed38347ebb19</Name><ContainerName>61b593a3061b593a32eb9786941f14bf7d59a47e3a4c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>63b8c227163b8c227ce90568506e00215a02e4dcda14</Name><ContainerName>63b8c227063b8c227ce993306f9cfcef171014a7db6a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>672b96731672b9673d7e05483552827d528624eb888f</Name><ContainerName>672b96730672b9673d7e90395203ff32512cf41e6be2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>67c0dd79167c0dd799f945087b9db1730d9ce41a78df</Name><ContainerName>67c0dd79067c0dd799f9719247384e33f1ba3480183f</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>685a75541685a75547692315957c9f503ac4e4ce3b89</Name><ContainerName>685a75540685a755476942855aba1da7b59c9470ca00</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>696c945c1696c945c2ba9729344cb3d6bc08a48e1a40</Name><ContainerName>696c945c0696c945c2ba47730308d09caf1554669914</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>6a89bade16a89badef5126481854a502e5e1c4ca88e4</Name><ContainerName>6a89bade06a89badef5151676dd6216b96b2c4ee4b85</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>6d5f05b116d5f05b1983741552772c26fde4340c380a</Name><ContainerName>6d5f05b106d5f05b198344654977dd1febc4944a4a19</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>6e49237916e49237983244542e4fe17f4f16d4db4bc1</Name><ContainerName>6e49237906e49237983235090af104dce80ca4038846</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>6e98aa7416e98aa7446163714371267764b10451dae0</Name><ContainerName>6e98aa7406e98aa7446177883a9a2c235fc1445449ef</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>6ec880b716ec880b769984138cfb46e3f12004d428da</Name><ContainerName>6ec880b706ec880b7699949336238f2dd52de4079b18</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7077a51d17077a51d9c3361062a46a9d8f09a406fbd5</Name><ContainerName>7077a51d07077a51d9c34550102eb028bff9f46bdb39</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7141441517141441505d70791cb54ef127c8149c880c</Name><ContainerName>7141441507141441505d419911e056557167b4004be7</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>73928b9f173928b9f0134024678a0ff95b6da4dc3988</Name><ContainerName>73928b9f073928b9f0130921267f07e22fe8f4c4ba4a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>744434f01744434f00bd47480d8dc4c645a2448ef9bb</Name><ContainerName>744434f00744434f00bd977759d77cf66c58647109bc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>77521238177521238dbd23602fdbbb0223ac24c528de</Name><ContainerName>77521238077521238dbd359042fb4dfb2b4df43bfa14</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>77839b35177839b35fa6137434e43cc4794b44939b9c</Name><ContainerName>77839b35077839b35fa62143480f65c0e16564d288a3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>77d3b1f6177d3b1f6c8b4580570f335e3451b4cd5b1b</Name><ContainerName>77d3b1f6077d3b1f6c8b69279eba3badb9ea841c0a15</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>78274875278274875ae076148682eaabf013a4f818c5</Name><ContainerName>78274875078274875ae096326519faae01353401cba6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>78aea2e2178aea2e27e8938932bcde6d64e9e4793bea</Name><ContainerName>78aea2e2078aea2e27e8238887edaa9e01f85484c951</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7aa3f36617aa3f3660c535543b1af059a20174334828</Name><ContainerName>7aa3f36607aa3f3660c50031644663eb30a6a4ed2876</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7e30a73217e30a732c7779129fcc9cdf87bc541d2be0</Name><ContainerName>7e30a73207e30a732c7725469bb86940bd87b46679a0</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7edbec3817edbec381985984126a866bc45f24681a83</Name><ContainerName>7edbec3807edbec381980940880a8d2edd4f84ce8ae3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>7f6d677017f6d67700d43734242300fd13edb41f6ab5</Name><ContainerName>7f6d677007f6d67700d4829112f4f0f340afd4ac5814</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8022c0bc18022c0bc27c00975455139232ce44023939</Name><ContainerName>8022c0bc08022c0bc27c43061d0add76c0aba4002a71</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>813936c01813936c03d44566916ee1d2c65864c8aac2</Name><ContainerName>813936c00813936c03d46135142084798342e4413a97</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>82a15470182a154702a321523aa8497ecf2e847d89af</Name><ContainerName>82a15470082a154702a38131883ec6de62bdd43d2b7f</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>84210eb2184210eb2a2b52353650fdba0c1fd4e32875</Name><ContainerName>84210eb2084210eb2a2b6737753c83649018b4c3eabe</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>858737781858737788c551504a2679f2dd18840088eb</Name><ContainerName>858737780858737788c5519104c2c5d465d8145869d3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>87826efd187826efdb8024629bca72e8096b04bc6a60</Name><ContainerName>87826efd087826efdb80091590c4feafc428c49f68ff</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8a3f3e2d18a3f3e2d72c52723c4db30da7aa144fbb3c</Name><ContainerName>8a3f3e2d08a3f3e2d72c16315d7295b2693db46ec936</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8a5cc5fc18a5cc5fcbef753872b3c207ff69647e5889</Name><ContainerName>8a5cc5fc08a5cc5fcbef8054450ce20c972214a119ae</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8b75126c18b75126c4c973240b7d2802275df4cfa812</Name><ContainerName>8b75126c08b75126c4c94273712ba9e1701464b448dc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8cb7963f18cb7963f23f78586da27177f630d47ec9e2</Name><ContainerName>8cb7963f08cb7963f23f50822983e18447c274959a98</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8d5c014d18d5c014de8094849e792b873870d49169d5</Name><ContainerName>8d5c014d08d5c014de80147015e9c0bdaad8d414bbba</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8eabdc7a18eabdc7a58a1346683225edc2bfc4b85810</Name><ContainerName>8eabdc7a08eabdc7a58a506088114298c81674f4e99c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>8f687daa18f687daaec054422e16a923c55e04c33809</Name><ContainerName>8f687daa08f687daaec0342729d1ddb822ca44caeb7c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>926e232d1926e232d3a922626fa6eb9ca06264b0899b</Name><ContainerName>926e232d0926e232d3a9190939659de4d8d58462ca6a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>93240f6c193240f6c93a876875a18b498c2fc4289b5e</Name><ContainerName>93240f6c093240f6c93a715674f6f55f8683b485187b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9347f4bd19347f4bdeae76019bd716dfb265e4e37bda</Name><ContainerName>9347f4bd09347f4bdeae42845fa6ceaf9cff948459df</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>93837cd6193837cd65c293467cfafd3263b14481fa64</Name><ContainerName>93837cd6093837cd65c21035650eeed7960ab41e0b87</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>938e5c5e1938e5c5e04424747ccbe2c6f6f14461f92b</Name><ContainerName>938e5c5e0938e5c5e04407274683570bd84d74101bb5</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9447300c19447300ccde312958f94f7ed31004323a7c</Name><ContainerName>9447300c09447300ccde83952615ef531b4a54ec3af8</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>95aca77e195aca77eb7a237917b574bd357684711908</Name><ContainerName>95aca77e095aca77eb7a1165357d7f1952b12462ead3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>97b0ed3b197b0ed3b92a863309d391541f09346ba929</Name><ContainerName>97b0ed3b097b0ed3b92a05840dd43793de7af414d9d1</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>98220781198220781d4104700a9a06f8049544c3cb55</Name><ContainerName>98220781098220781d4100449b2c68610aa6b483ba53</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9939f1fd19939f1fdf5671497a8652b2ec66a4e7aa81</Name><ContainerName>9939f1fd09939f1fdf56727427b5495007f964ee9a9a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9bba653119bba653159a40342fbd56a1f020b4812876</Name><ContainerName>9bba653109bba653159a270718dfe9e545cbc43999a8</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9d3a3ff319d3a3ff3a087993145f00fcda94e405080f</Name><ContainerName>9d3a3ff309d3a3ff3a08978063ae8c050df074fff8ef</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>9e995fbc19e995fbcbaf358082ef9725294854a43b74</Name><ContainerName>9e995fbc09e995fbcbaf24640f6c60feb89c747d58a3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a05841af1a05841af2e067480db8a3544c3904a3f847</Name><ContainerName>a05841af0a05841af2e040141a6f27cbe7c8b4b4c8d6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a1126dee1a1126dee69c67702da6b5e4a417143b5a54</Name><ContainerName>a1126dee0a1126dee69c5093475a3e01bb9d84933a3b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a171963f1a171963feb305018846f82e825c54fe4a32</Name><ContainerName>a171963f0a171963feb3745558296284f7ca74a0894d</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a1b83edc1a1b83edce6910865024443784da04279be3</Name><ContainerName>a1b83edc0a1b83edce69415926a1cd267d9264d10be6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a4452e691a4452e69029461654b36edd561d5413caa4</Name><ContainerName>a4452e690a4452e6902904777b13cd18662584b59ae1</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a64773511a6477351fa8972513d28bf9f1a694fadb45</Name><ContainerName>a64773510a6477351fa8620537bc7c62c671f4f009ad</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a671528e1a671528e10b779669267b44d58444923b99</Name><ContainerName>a671528e0a671528e10b6451175f147aeff73424e883</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a79ac5fc1a79ac5fc1c431944b607a4ac04f143a3862</Name><ContainerName>a79ac5fc0a79ac5fc1c4258032f6b1c4272f94f8fb5e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>a98c07b31a98c07b378c6863592f25b15be8c418c827</Name><ContainerName>a98c07b30a98c07b378c898878af68862cacb4fdabc8</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>abd111241abd111240df637582ccb0e45a4c44a52a5a</Name><ContainerName>abd111240abd111240df565969357be4b96414602a0c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>af0c5d711af0c5d71055664645e078fc3d51a47bdaf5</Name><ContainerName>af0c5d710af0c5d71055121919d0873e60253494bbd8</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>af1957711af1957711c559763c715ba584e7246bb82c</Name><ContainerName>af1957710af1957711c568649a0484d5d396d4440931</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b214a23e1b214a23e37258221c39d42b58c494831be1</Name><ContainerName>b214a23e0b214a23e37287449a4a13773df1845f29db</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b56bef331b56bef33ce508616e3f3fd502f364f1d905</Name><ContainerName>b56bef330b56bef33ce54016474681ea298c24203857</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b5b40c7f1b5b40c7f9a61788735258015ff0e4e8baf7</Name><ContainerName>b5b40c7f0b5b40c7f9a671342302a038323bb4010b29</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b60266301b60266305a8313255a25c8d3cabd40d2add</Name><ContainerName>b60266300b60266305a86522228520cc2c6bd43cba2f</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b6176c301b6176c304c5900543dee7be88701414dbad</Name><ContainerName>b6176c300b6176c304c5114560cabb4f647f24df7ae5</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b8095caf1b8095cafb643475964a47c6c45574ceeba3</Name><ContainerName>b8095caf0b8095cafb6468012382b05754a794fa5904</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b86aa77e1b86aa77ebb92701766ae9553720c4b5eb11</Name><ContainerName>b86aa77e0b86aa77ebb99873976ac8c93d6894c4cbde</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b8a30f9d1b8a30f9ddf83130928bee4d11a694c1b801</Name><ContainerName>b8a30f9d0b8a30f9ddf841127de5c3b8ee11c4b37a3b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>b94370ee1b94370ee9910816882299fc3657345f8bd2</Name><ContainerName>b94370ee0b94370ee99161534e1d83333deda4f74b87</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bce4ce531bce4ce5331761899f25b0fb0d33346bb871</Name><ContainerName>bce4ce530bce4ce533177115830a3be2e47654197a9c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bd5e1f281bd5e1f2889b91796c45479a522fe4b7996b</Name><ContainerName>bd5e1f280bd5e1f2889b86723b74d0cbbee9742ebba4</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>be81f4bd1be81f4bddb459810fe87e0b6c0ff490db01</Name><ContainerName>be81f4bd0be81f4bddb469573ddb81bcd15b14ccca35</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bf6a63cf1bf6a63cf54789041606c0ddbb85643a7afd</Name><ContainerName>bf6a63cf0bf6a63cf54773549171412dcb8254ca4a28</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c027539a1c027539a8107303216ec8a18ec234176ba0</Name><ContainerName>c027539a0c027539a81016711ebfd601d1de0415b9b9</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c029eb6d1c029eb6dc2429673d580edb745ae415f980</Name><ContainerName>c029eb6d0c029eb6dc2457847a82b5e9147f54523a92</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c21d978a1c21d978a866446791ce377f5db224e80a3d</Name><ContainerName>c21d978a0c21d978a8665094127da2914224945b0aec</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c3f600f81c3f600f8e3d317616f1567c844de4338a83</Name><ContainerName>c3f600f80c3f600f8e3d2215320e51128db2449478aa</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c43484ab1c43484ab670984955a7373396e964833979</Name><ContainerName>c43484ab0c43484ab67059957b6457b4cf0814119a4e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c57ea8ea1c57ea8ea50870457e4f8f616cb5a4f88837</Name><ContainerName>c57ea8ea0c57ea8ea508982179d0c16d6f3cc47a1828</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c5d4fbd81c5d4fbd8bef25370a41ef2045c194e6fb5c</Name><ContainerName>c5d4fbd80c5d4fbd8bef21105780d6f58b4aa4b3dabc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c8a63cd41c8a63cd4270586738ea315f790284572858</Name><ContainerName>c8a63cd40c8a63cd427062817a3db7031532046c7882</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>c8c3f83a1c8c3f83a2f066953364c8ab9dd144ee085b</Name><ContainerName>c8c3f83a0c8c3f83a2f081306cdf7b4779c3246049de</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>cb6098751cb6098751403299980e07659064240eeaa4</Name><ContainerName>cb6098750cb60987514047780406c2cc0257e4816b23</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>cde0c2b71cde0c2b7e5987559c1f19d19e6d942919e3</Name><ContainerName>cde0c2b70cde0c2b7e5948824cc74ca14fe554034866</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ce78a0071ce78a0077eb26335fd68f8dc3f9547198ce</Name><ContainerName>ce78a0070ce78a0077eb82149b7904202aa3a4a999c1</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>cf3985191cf398519bfc597949dd4530d289d44948c6</Name><ContainerName>cf3985190cf398519bfc262526a6783da373244e1b6e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>cf63567b1cf63567bd8e6266239ff5144b5104a7ca98</Name><ContainerName>cf63567b0cf63567bd8e854611b950fd1a48149f9b09</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d1d8c97b1d1d8c97b70176958336ad5ddeedc4d12a35</Name><ContainerName>d1d8c97b0d1d8c97b70184742b6ddfcea9abc4e3cb51</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d27ba9341d27ba9341df29695bc9c85f2d28944c0a1d</Name><ContainerName>d27ba9340d27ba9341df43567bc2cfe9e9eaa4dbcad9</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d4fbf3f61d4fbf3f668829342c8dcb50ec3834cb2ba8</Name><ContainerName>d4fbf3f60d4fbf3f66884433631ca14ceae604e3f999</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d678673a1d678673a48d96006e2a2be5e3b844d85a07</Name><ContainerName>d678673a0d678673a48d880031364b7d0aa3f45928db</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d76391461d763914685a5152499ba4230b3144f09a2a</Name><ContainerName>d76391460d763914685a962269444f59d18ff4592a1d</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>d932da2c1d932da2c9ea266243209ab03eb5d4768961</Name><ContainerName>d932da2c0d932da2c9ea35091bf5a9e8fe3f24ee1847</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>daed31b91daed31b97cf478995277f1a4518540639b0</Name><ContainerName>daed31b90daed31b97cf34577ae448fc683424966aee</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>db06a6cb1db06a6cb531223510cb454b93d59436aaad</Name><ContainerName>db06a6cb0db06a6cb531191449ad8efe37d764e3398b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>dc06627a1dc06627ab46376746271f5002f5841f1a4f</Name><ContainerName>dc06627a0dc06627ab4635938d3599699dd0d4978ba2</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>dc6599ab1dc6599ab07299175e241e147b2564f63b98</Name><ContainerName>dc6599ab0dc6599ab07207638b76b8b96cd934493a12</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>dccfca991dccfca99a3647809c81bdb3f3ec54429938</Name><ContainerName>dccfca990dccfca99a36986710bbb6fbd43604872ab0</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>dd770f251dd770f25ad0334710149f466c4bc426fafb</Name><ContainerName>dd770f250dd770f25ad0976606bbc1b46cae94fe39ff</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbd72d03369fa83dd25a7b64ee08ed</Name><ContainerName>ddff4dbd0ddff4dbd72d1490464546d5b3b3e4100bdf</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbde9b66196556a1a94ee5d4eec9c2</Name><ContainerName>ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6b9a001708047a33d64fdc40229d4</Name><ContainerName>e288aa6b0e288aa6b9a03004072d97481ea9442608d8</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6bd9167451bb8a32f60bcc436fa0b</Name><ContainerName>e288aa6b0e288aa6bd9172714286eee8dc676460ca16</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e3eeabf91e3eeabf9ade03451e58ede3cddcd4aa8bbf</Name><ContainerName>e3eeabf90e3eeabf9ade86183653cfa650ed744619aa</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e44e05b81e44e05b856395891e159c3d02a5a4cada9a</Name><ContainerName>e44e05b80e44e05b856304096a2d7e209b0d045088a4</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e555f3c41e555f3c46d009295ac20feaf5ee042b9921</Name><ContainerName>e555f3c40e555f3c46d0763405072a8a1f60740f484e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e6cd91741e6cd917476a83896fa1589f6e5034eb5bc3</Name><ContainerName>e6cd91740e6cd917476a63308d4ff881dcebb46d0938</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e6fbb6481e6fbb6483be70040acb4edbf3bab4f848d4</Name><ContainerName>e6fbb6480e6fbb6483be066863f8d22d4fb724896bcb</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e8db533b1e8db533b36f90117695f290d7de7474381f</Name><ContainerName>e8db533b0e8db533b36f95076487eb2e4ee3b40e8a10</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e930c4491e930c44915872013e7590d57f2bd4f69871</Name><ContainerName>e930c4490e930c449158043096296ac00790a4fd787a</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e9a517921e9a51792ae14562864139f653992459eabf</Name><ContainerName>e9a517920e9a51792ae146679b0ed66d6abf149ab939</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>eb04b8ae1eb04b8aec7d03249cc8120d9e13f4281ad9</Name><ContainerName>eb04b8ae0eb04b8aec7d9078378f27ee3710a491e950</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ee3000f81ee3000f80f388340822148b9d7a847408bf</Name><ContainerName>ee3000f80ee3000f80f37838468ce59197d7a447396c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ee53fb291ee53fb2925f68179f936cfc921754f7e8d3</Name><ContainerName>ee53fb290ee53fb2925f354084d310d5495d742c0ba3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>eef9a81b1eef9a81bcc8799562965b33ec4f04020bf5</Name><ContainerName>eef9a81b0eef9a81bcc84708053c52c5155d948aabcc</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ef19d7681ef19d768f5d468776f416d289fef4f46ac4</Name><ContainerName>ef19d7680ef19d768f5d5018680a2451920154d24b88</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f02bf5081f02bf508a3c16595edfcbf6229734a0e8dd</Name><ContainerName>f02bf5080f02bf508a3c131572f5108dfd9ad4c47b14</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f21f89ef1f21f89ef82908545b673ba8af66344a49ba</Name><ContainerName>f21f89ef0f21f89ef82960912712cf450fe3240ff9e3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f227f3eb1f227f3eb3aa03344e1dffaedeb1b431c9a9</Name><ContainerName>f227f3eb0f227f3eb3aa05800487f0e5c5a45471ba79</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f602e6291f602e62963965041c1b60276f2c845e1929</Name><ContainerName>f602e6290f602e62963923656abc414a002a34c909d4</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f72b31b91f72b31b931b98182c2ffc2e703cd42ebaf9</Name><ContainerName>f72b31b90f72b31b931b441351a919d1208a1470783c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f748ca681f748ca6886d76446fe069db276d24ef4a82</Name><ContainerName>f748ca680f748ca6886d87457cc2622339a2e4b5fb76</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>f7e2995a1f7e2995a35d079914b631e1c4811497abaf</Name><ContainerName>f7e2995a0f7e2995a35d781846308155394ee4776a0d</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>faf59ab81faf59ab891565087cf5c02b64a614569bce</Name><ContainerName>faf59ab80faf59ab891582171d34666de9f3f4d75b64</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>fc4ec2851fc4ec285e94293911bea954366ad414fa7e</Name><ContainerName>fc4ec2850fc4ec285e94218224c481ff8c80747c1bc3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>fd18864d2fd18864ddc341391d2be3ebed2164af8a21</Name><ContainerName>fd18864d0fd18864ddc310149e3f942a7cf294cc4911</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>fd5534f91fd5534f9d4b5906558813e477bdf4df0a3c</Name><ContainerName>fd5534f90fd5534f9d4b75144dcc3c7f5a48748bca8c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ffd6a0351ffd6a03588f16508b896816286a84f1183d</Name><ContainerName>ffd6a0350ffd6a03588f370050e741cae33f94e5aaa3</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob></Blobs><NextMarker/></EnumerationResults>",
-      "x-ms-client-request-id" : "9341a0a8-7ef7-476a-b7ce-be773f4b9c10",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT",
+      "x-ms-request-id" : "acc125b3-e01e-0095-12ff-483277000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\"><Where>&quot;foo&quot;=&apos;bar&apos;</Where><Blobs><Blob><Name>bce4ce531bce4ce533b66307514a3e7eb0b574b4e911</Name><ContainerName>bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bce4ce531bce4ce53521438650821033fd1964acf9ac</Name><ContainerName>bce4ce530bce4ce5352124645e23c2ff95b3847debc4</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bce4ce531bce4ce5380549094dbe2d3273f214cfaa5e</Name><ContainerName>bce4ce530bce4ce53805191948657656ef2d74c779b6</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>bce4ce531bce4ce53d0f7504224eec537e0f5431da79</Name><ContainerName>bce4ce530bce4ce53d0f57807bb25c4e9b67541ffb74</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbd24903940bb73d59222834f099f3</Name><ContainerName>ddff4dbd0ddff4dbd24974420009d07a1bb5a46f69af</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbd3ee83686dc1bc3d29ce94eb392f</Name><ContainerName>ddff4dbd0ddff4dbd3ee2514377e6a4c37ca844d696c</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbdc94522123286e2b4ef864a84874</Name><ContainerName>ddff4dbd0ddff4dbdc9443399bdc7c36f40e6415f846</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>ddff4dbd1ddff4dbded1002048e7e7c0ffb444313bb4</Name><ContainerName>ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6b445995187de6270fb1e545c5b8e</Name><ContainerName>e288aa6b0e288aa6b445322772fe61016847640bea52</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6b5db813878d81914e9f8d483ea3d</Name><ContainerName>e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6bb962272341a102d78e6f4a1fb9d</Name><ContainerName>e288aa6b0e288aa6bb9689763ffb75687ba454a7ebaf</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob><Blob><Name>e288aa6b1e288aa6bd7c7440921320b016d114074964</Name><ContainerName>e288aa6b0e288aa6bd7c8308644fcaba55b0b47d1a7b</ContainerName><Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags></Blob></Blobs><NextMarker/></EnumerationResults>",
+      "x-ms-client-request-id" : "b16e226f-ffa2-4564-b05a-697e8a5a9726",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=bce4ce53",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "aa5da62c-0e88-40fb-ad9a-c9596427ba3e"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630b50b-c01e-001b-7bd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>bce4ce53</Prefix><Containers><Container><Name>bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:58 GMT</Last-Modified><Etag>\"0x8D90FEE571ECEC3\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "aa5da62c-0e88-40fb-ad9a-c9596427ba3e",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eb2c383e-6abf-4751-8b5c-48047fc92efa"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630b53a-c01e-001b-23d7-41f4b2000000",
-      "x-ms-client-request-id" : "eb2c383e-6abf-4751-8b5c-48047fc92efa",
-      "Date" : "Wed, 05 May 2021 17:51:00 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "bce4ce530bce4ce532dc48320b59b81d2c56b485cbc3", "bce4ce531bce4ce532dc0880891479f63a3e54c44bf7", "2021-05-05T17:50:59.075798100Z" ]
+  "variables" : [ "bce4ce530bce4ce533b669839c3dd6dcb2a4648cdb6e", "bce4ce531bce4ce533b66307514a3e7eb0b574b4e911", "2021-05-14T20:26:17.333688200Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsFail.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsFail.json
index 81dea7fe53f0..c781ced98335 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsFail.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsAccountSasTagsFail.json
@@ -1,113 +1,74 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab54e65087442cf21dc8eb74045aa4?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab549639466e8812d440b014ffb9e0?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c161e521-e5cf-499a-969c-32bcb3b83874"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7a53ba64-cb69-447a-8f6e-2f88b093a62e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE58D35E4B",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:01 GMT",
+      "eTag" : "0x8D9171686A89AEF",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630b8c0-c01e-001b-5ad7-41f4b2000000",
-      "x-ms-client-request-id" : "c161e521-e5cf-499a-969c-32bcb3b83874",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT"
+      "x-ms-request-id" : "9a8fccfb-d01e-0027-15ff-48cd06000000",
+      "x-ms-client-request-id" : "7a53ba64-cb69-447a-8f6e-2f88b093a62e",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab54e65087442cf21dc8eb74045aa4/ca83dab51ca83dab54e605414c49382983a17474db94",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab549639466e8812d440b014ffb9e0/ca83dab51ca83dab5496755091de014c82d7d4f4298d",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9e8ff846-4419-4d6e-9e06-59eabc72873b",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9614c487-b095-4e11-8f85-5e006f779f42",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:01 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1598526Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE58DFA6B9",
-      "x-ms-request-id" : "e630b8f3-c01e-001b-03d7-41f4b2000000",
-      "x-ms-client-request-id" : "9e8ff846-4419-4d6e-9e06-59eabc72873b"
+      "eTag" : "0x8D917168704DEBE",
+      "x-ms-request-id" : "48752f62-701e-0011-7eff-484076000000",
+      "x-ms-client-request-id" : "9614c487-b095-4e11-8f85-5e006f779f42"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab54e65087442cf21dc8eb74045aa4/ca83dab51ca83dab54e605414c49382983a17474db94?comp=tags&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A01Z&sp=rwdxlacupf&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab549639466e8812d440b014ffb9e0/ca83dab51ca83dab5496755091de014c82d7d4f4298d?comp=tags&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=rwdxlacupf&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7dc8f09a-4deb-447b-a665-040edcdb0797",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e85b20c5-8051-4e23-8253-415b5b09c337",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "280",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630b922-c01e-001b-28d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630b922-c01e-001b-28d7-41f4b2000000\nTime:2021-05-05T17:51:01.8117324Z</Message></Error>",
-      "x-ms-client-request-id" : "7dc8f09a-4deb-447b-a665-040edcdb0797",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
+      "x-ms-request-id" : "49ad3a2d-601e-008b-50ff-48deaf000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:49ad3a2d-601e-008b-50ff-48deaf000000\nTime:2021-05-14T20:26:17.8289914Z</Message></Error>",
+      "x-ms-client-request-id" : "e85b20c5-8051-4e23-8253-415b5b09c337",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ca83dab5",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3dd6f623-f608-4d02-a7d3-fcf06510a83d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630b95c-c01e-001b-59d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ca83dab5</Prefix><Containers><Container><Name>ca83dab50ca83dab54e65087442cf21dc8eb74045aa4</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:01 GMT</Last-Modified><Etag>\"0x8D90FEE58D35E4B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3dd6f623-f608-4d02-a7d3-fcf06510a83d",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca83dab50ca83dab54e65087442cf21dc8eb74045aa4?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "91443956-1436-4d5e-9463-7a4e3b8e53db"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630b97f-c01e-001b-79d7-41f4b2000000",
-      "x-ms-client-request-id" : "91443956-1436-4d5e-9463-7a4e3b8e53db",
-      "Date" : "Wed, 05 May 2021 17:51:01 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "ca83dab50ca83dab54e65087442cf21dc8eb74045aa4", "ca83dab51ca83dab54e605414c49382983a17474db94", "2021-05-05T17:51:01.918119Z" ]
+  "variables" : [ "ca83dab50ca83dab549639466e8812d440b014ffb9e0", "ca83dab51ca83dab5496755091de014c82d7d4f4298d", "2021-05-14T20:26:17.332688400Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[0].json
index 9e30ea4892a1..f65772a792c7 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[0].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[0].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bfdba3308bfdba33f9e56960d59dca5370494eba9cb?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bfdba3308bfdba330c97658022956e2d385545b9864?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b8d03c2b-b226-4d23-b64f-5eed63b6e6c7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "78283551-47b3-4472-9476-b8bb48603e72"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538856BAC9",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:49 GMT",
+      "eTag" : "0x8D9171686A8FEBB",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "473f385a-801e-001a-3b3c-41ab6e000000",
-      "x-ms-client-request-id" : "b8d03c2b-b226-4d23-b64f-5eed63b6e6c7",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "x-ms-request-id" : "538548ae-d01e-0045-73ff-480f21000000",
+      "x-ms-client-request-id" : "78283551-47b3-4472-9476-b8bb48603e72",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bfdba3308bfdba33f9e56960d59dca5370494eba9cb/8bfdba3318bfdba33f9e4892161ecbb85057b4996ae6",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bfdba3308bfdba330c97658022956e2d385545b9864/8bfdba3318bfdba330c988801e7deb52105cc400386a",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "90807b5f-16d6-430f-b5ff-63499a100047",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "09f2f024-751a-4894-bbe6-2d9ddd8028c6",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:49 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1598526Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538862E012",
-      "x-ms-request-id" : "256c2383-301e-0052-0d3c-41b659000000",
-      "x-ms-client-request-id" : "90807b5f-16d6-430f-b5ff-63499a100047"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=8bfdba33",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9dd2e755-f031-470a-920e-1306e5b8da35"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "06d9b1d5-201e-0061-363c-41e9f2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>8bfdba33</Prefix><Containers><Container><Name>8bfdba3308bfdba33f9e56960d59dca5370494eba9cb</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:49 GMT</Last-Modified><Etag>\"0x8D90F538856BAC9\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9dd2e755-f031-470a-920e-1306e5b8da35",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bfdba3308bfdba33f9e56960d59dca5370494eba9cb?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0bf58d43-6c87-4d35-a8e3-751d93c5990d"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "ce1b46af-a01e-0050-4b3c-4108e1000000",
-      "x-ms-client-request-id" : "0bf58d43-6c87-4d35-a8e3-751d93c5990d",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "eTag" : "0x8D917168704DEBE",
+      "x-ms-request-id" : "6b15067e-f01e-0089-30ff-486017000000",
+      "x-ms-client-request-id" : "09f2f024-751a-4894-bbe6-2d9ddd8028c6"
     },
     "Exception" : null
   } ],
-  "variables" : [ "8bfdba3308bfdba33f9e56960d59dca5370494eba9cb", "8bfdba3318bfdba33f9e4892161ecbb85057b4996ae6" ]
+  "variables" : [ "8bfdba3308bfdba330c97658022956e2d385545b9864", "8bfdba3318bfdba330c988801e7deb52105cc400386a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[1].json
index 76dd0a084cf9..38977f6d7588 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[1].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[1].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92e68b72092e68b72afd9098220242b302ef44eed84d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92e68b72092e68b7262e33392ce0353c451d34a91a45?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5d478687-0399-4a34-923b-ff0849d4b8ed"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6a098498-9db4-494c-bf89-f7285190a760"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538887731A",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:49 GMT",
+      "eTag" : "0x8D9171686A8E47D",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "33355750-b01e-004c-6a3c-415a81000000",
-      "x-ms-client-request-id" : "5d478687-0399-4a34-923b-ff0849d4b8ed",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "x-ms-request-id" : "e17661f7-601e-001d-10ff-48d77e000000",
+      "x-ms-client-request-id" : "6a098498-9db4-494c-bf89-f7285190a760",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92e68b72092e68b72afd9098220242b302ef44eed84d/92e68b72192e68b72afd20589a4daf885d9f34b95b89",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92e68b72092e68b7262e33392ce0353c451d34a91a45/92e68b72192e68b7262e3427037f1f57293dc489da51",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "807fb4ee-4170-48ca-96d2-64fc5fef036c",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f186a7bc-6c50-460e-b5be-1546ffadcddd",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:49 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3469858Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:48 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538892F979",
-      "x-ms-request-id" : "4124cbba-101e-0045-553c-411f52000000",
-      "x-ms-client-request-id" : "807fb4ee-4170-48ca-96d2-64fc5fef036c"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=92e68b72",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "72b8d172-9623-4621-919b-5df8b31694bc"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "256c24c9-301e-0052-243c-41b659000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>92e68b72</Prefix><Containers><Container><Name>92e68b72092e68b72afd9098220242b302ef44eed84d</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:49 GMT</Last-Modified><Etag>\"0x8D90F538887731A\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "72b8d172-9623-4621-919b-5df8b31694bc",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92e68b72092e68b72afd9098220242b302ef44eed84d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "132a2769-2a40-472a-89db-dc85984d02a5"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "895984f4-401e-002a-683c-4115a1000000",
-      "x-ms-client-request-id" : "132a2769-2a40-472a-89db-dc85984d02a5",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "eTag" : "0x8D9171687216CA2",
+      "x-ms-request-id" : "2290b5b2-d01e-0037-2cff-48086e000000",
+      "x-ms-client-request-id" : "f186a7bc-6c50-460e-b5be-1546ffadcddd"
     },
     "Exception" : null
   } ],
-  "variables" : [ "92e68b72092e68b72afd9098220242b302ef44eed84d", "92e68b72192e68b72afd20589a4daf885d9f34b95b89" ]
+  "variables" : [ "92e68b72092e68b7262e33392ce0353c451d34a91a45", "92e68b72192e68b7262e3427037f1f57293dc489da51" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[2].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[2].json
index 75c5f0cae23a..b6318134d26d 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[2].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilCanonicalizedResource[2].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b9cbd8b10b9cbd8b124053190bf9f377d69104797a2f?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b9cbd8b10b9cbd8b1049356792e163c1d69244f448d3?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0e22e5e1-c79e-4ce2-a3cb-c74c06c5383d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2713b439-3cf3-4af0-8888-1f45503da9a5"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F5388B6DAEB",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:50 GMT",
+      "eTag" : "0x8D9171686CDC781",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "d1058338-a01e-0022-6e3c-410fae000000",
-      "x-ms-client-request-id" : "0e22e5e1-c79e-4ce2-a3cb-c74c06c5383d",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "x-ms-request-id" : "2290b4f0-d01e-0037-0eff-48086e000000",
+      "x-ms-client-request-id" : "2713b439-3cf3-4af0-8888-1f45503da9a5",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b9cbd8b10b9cbd8b124053190bf9f377d69104797a2f/b9cbd8b11b9cbd8b12408216098d4e754b31a4bd09b3",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b9cbd8b10b9cbd8b1049356792e163c1d69244f448d3/b9cbd8b11b9cbd8b10497280522274c1210c3484f96b",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "901ad427-3d8d-4d44-b6a0-1475dfc60e55",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f857f47d-b34e-4df3-83f3-c84d0002b229",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:50 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2439119Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F5388C3AF37",
-      "x-ms-request-id" : "237a07ed-001e-003b-383c-418f15000000",
-      "x-ms-client-request-id" : "901ad427-3d8d-4d44-b6a0-1475dfc60e55"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=b9cbd8b1",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "67d5c8e5-fc92-43d6-b8d6-93428e6ad792"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "473f3a55-801e-001a-513c-41ab6e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>b9cbd8b1</Prefix><Containers><Container><Name>b9cbd8b10b9cbd8b124053190bf9f377d69104797a2f</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:50 GMT</Last-Modified><Etag>\"0x8D90F5388B6DAEB\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "67d5c8e5-fc92-43d6-b8d6-93428e6ad792",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b9cbd8b10b9cbd8b124053190bf9f377d69104797a2f?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "15751298-29b9-42cd-8ff3-a62df99afd11"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "2824d767-401e-003a-233c-41d0c9000000",
-      "x-ms-client-request-id" : "15751298-29b9-42cd-8ff3-a62df99afd11",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "eTag" : "0x8D917168711B24F",
+      "x-ms-request-id" : "6b150692-f01e-0089-42ff-486017000000",
+      "x-ms-client-request-id" : "f857f47d-b34e-4df3-83f3-c84d0002b229"
     },
     "Exception" : null
   } ],
-  "variables" : [ "b9cbd8b10b9cbd8b124053190bf9f377d69104797a2f", "b9cbd8b11b9cbd8b12408216098d4e754b31a4bd09b3" ]
+  "variables" : [ "b9cbd8b10b9cbd8b1049356792e163c1d69244f448d3", "b9cbd8b11b9cbd8b10497280522274c1210c3484f96b" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[0].json
index 760759fd91c2..b71429851d29 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[0].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[0].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bda635b80bda635b88c480792d974ca1e67be45d2ab9?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bda635b80bda635b86a203159e3b1895a73cb400d8fc?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "995cd088-f39b-46e3-b222-680074900f8f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "916522c5-24e0-4532-8995-dc2098a0eb52"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F5388E7DC27",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:50 GMT",
+      "eTag" : "0x8D9171686A66C22",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e8ca3909-c01e-000b-1d3c-4131da000000",
-      "x-ms-client-request-id" : "995cd088-f39b-46e3-b222-680074900f8f",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT"
+      "x-ms-request-id" : "f99e7b91-201e-0023-39ff-484001000000",
+      "x-ms-client-request-id" : "916522c5-24e0-4532-8995-dc2098a0eb52",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bda635b80bda635b88c480792d974ca1e67be45d2ab9/bda635b81bda635b88c40686361b2e27715424630a8b",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bda635b80bda635b86a203159e3b1895a73cb400d8fc/bda635b81bda635b86a28812607b2a268d0aa49e0a73",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bc1eb220-fff5-41f8-bd5c-ea0f8ce5981d",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7ddb3d9f-eb2c-45af-b051-688e9b2f0843",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:50 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2439119Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F5388F3C888",
-      "x-ms-request-id" : "6c1f3405-801e-0078-7b3c-416949000000",
-      "x-ms-client-request-id" : "bc1eb220-fff5-41f8-bd5c-ea0f8ce5981d"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=bda635b8",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ca54b17b-5230-4f8c-97c1-511d54fc23db"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "b83214fe-201e-002c-263c-41261e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>bda635b8</Prefix><Containers><Container><Name>bda635b80bda635b88c480792d974ca1e67be45d2ab9</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:50 GMT</Last-Modified><Etag>\"0x8D90F5388E7DC27\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ca54b17b-5230-4f8c-97c1-511d54fc23db",
-      "Date" : "Tue, 04 May 2021 23:22:49 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/bda635b80bda635b88c480792d974ca1e67be45d2ab9?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b6ed7f64-bdb9-466e-b672-96a52f180d0b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "7076eb0f-b01e-002e-723c-4198a6000000",
-      "x-ms-client-request-id" : "b6ed7f64-bdb9-466e-b672-96a52f180d0b",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D917168711B24F",
+      "x-ms-request-id" : "8fc45880-e01e-0013-40ff-48fece000000",
+      "x-ms-client-request-id" : "7ddb3d9f-eb2c-45af-b051-688e9b2f0843"
     },
     "Exception" : null
   } ],
-  "variables" : [ "bda635b80bda635b88c480792d974ca1e67be45d2ab9", "bda635b81bda635b88c40686361b2e27715424630a8b" ]
+  "variables" : [ "bda635b80bda635b86a203159e3b1895a73cb400d8fc", "bda635b81bda635b86a28812607b2a268d0aa49e0a73" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[10].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[10].json
index dfe14b9b0204..b7cfdd26781a 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[10].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[10].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d34e20920d34e20920fb51866486154b66b6848c7b7a?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d34e20920d34e209283c83845368db552d6ff402cba9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4559990b-3806-47d7-8cd6-fe50406a7207"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d2e29df8-8ce5-4850-8004-d2f76de4e838"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A6FA211",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687BB4A45",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "3ba869f6-d01e-005a-3e3c-41ac56000000",
-      "x-ms-client-request-id" : "4559990b-3806-47d7-8cd6-fe50406a7207",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "49ad3bea-601e-008b-71ff-48deaf000000",
+      "x-ms-client-request-id" : "d2e29df8-8ce5-4850-8004-d2f76de4e838",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d34e20920d34e20920fb51866486154b66b6848c7b7a/d34e20921d34e20920fb68241ccddba1a1c364d6aaf7",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d34e20920d34e209283c83845368db552d6ff402cba9/d34e20921d34e209283c152992691aac83f334092b71",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "28e427cd-5183-45f5-a146-398d74768ba2",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "228f15a6-146f-489f-ab3a-5c87f1e2729a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6088820Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A7B726B",
-      "x-ms-request-id" : "9e561b91-901e-0039-5e3c-4131ad000000",
-      "x-ms-client-request-id" : "28e427cd-5183-45f5-a146-398d74768ba2"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=d34e2092",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0c454fe9-564c-4ad1-ac78-36fba68406dd"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "33355d9d-b01e-004c-4d3c-415a81000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>d34e2092</Prefix><Containers><Container><Name>d34e20920d34e20920fb51866486154b66b6848c7b7a</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A6FA211\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "0c454fe9-564c-4ad1-ac78-36fba68406dd",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d34e20920d34e20920fb51866486154b66b6848c7b7a?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "13532a2c-6b84-4cbb-8bc2-c85d68a434cf"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "cd53c36b-c01e-001b-303c-41f4b2000000",
-      "x-ms-client-request-id" : "13532a2c-6b84-4cbb-8bc2-c85d68a434cf",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687E1F974",
+      "x-ms-request-id" : "a1f886b1-e01e-005e-3dff-483122000000",
+      "x-ms-client-request-id" : "228f15a6-146f-489f-ab3a-5c87f1e2729a"
     },
     "Exception" : null
   } ],
-  "variables" : [ "d34e20920d34e20920fb51866486154b66b6848c7b7a", "d34e20921d34e20920fb68241ccddba1a1c364d6aaf7" ]
+  "variables" : [ "d34e20920d34e209283c83845368db552d6ff402cba9", "d34e20921d34e209283c152992691aac83f334092b71" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[11].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[11].json
index 37e64065bd8a..6a1f5b772f17 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[11].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[11].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca5511d30ca5511d31d66801725c8a1957fdc4a8b9e4?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca5511d30ca5511d37a9199400377ea3520b44187805?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "db890a3d-ed92-4dd1-806b-628ffd025c9e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1d206570-c535-4dea-b354-56246aa58b4c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A772577",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687BBD49B",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "55bba8e8-f01e-0010-503c-410fd9000000",
-      "x-ms-client-request-id" : "db890a3d-ed92-4dd1-806b-628ffd025c9e",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "2290b796-d01e-0037-62ff-48086e000000",
+      "x-ms-client-request-id" : "1d206570-c535-4dea-b354-56246aa58b4c",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca5511d30ca5511d31d66801725c8a1957fdc4a8b9e4/ca5511d31ca5511d31d6608186ef8e655531b46b3a81",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca5511d30ca5511d37a9199400377ea3520b44187805/ca5511d31ca5511d37a9837364dd4a161c1ca4a77bda",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "be3ec1d9-6268-4418-87c1-9f89d325be50",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d3bab2c1-945d-498d-a012-47467810a509",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6008767Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A829FA8",
-      "x-ms-request-id" : "1385bf89-801e-0068-2b3c-41ac21000000",
-      "x-ms-client-request-id" : "be3ec1d9-6268-4418-87c1-9f89d325be50"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ca5511d3",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fcbe95cb-d78e-4069-8a4f-98d0c9f42e6d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "2824decd-401e-003a-063c-41d0c9000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ca5511d3</Prefix><Containers><Container><Name>ca5511d30ca5511d31d66801725c8a1957fdc4a8b9e4</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A772577\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "fcbe95cb-d78e-4069-8a4f-98d0c9f42e6d",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca5511d30ca5511d31d66801725c8a1957fdc4a8b9e4?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d533f407-cb35-4384-99c9-2eab57268f45"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "d1058c11-a01e-0022-4f3c-410fae000000",
-      "x-ms-client-request-id" : "d533f407-cb35-4384-99c9-2eab57268f45",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687E0C0BF",
+      "x-ms-request-id" : "02575091-b01e-0088-34ff-483fcb000000",
+      "x-ms-client-request-id" : "d3bab2c1-945d-498d-a012-47467810a509"
     },
     "Exception" : null
   } ],
-  "variables" : [ "ca5511d30ca5511d31d66801725c8a1957fdc4a8b9e4", "ca5511d31ca5511d31d6608186ef8e655531b46b3a81" ]
+  "variables" : [ "ca5511d30ca5511d37a9199400377ea3520b44187805", "ca5511d31ca5511d37a9837364dd4a161c1ca4a77bda" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[12].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[12].json
index 70f19bb8a07e..dde8fa2dc5aa 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[12].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[12].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e17842100e1784210b3d645596954418c8a12467f89e?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e17842100e17842105ee663292ccaab6851844ba8a37?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cd70ef2b-a674-4d90-b149-86157a04d068"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6ef2c91d-2102-448c-bf75-852baa749614"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A8866AF",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687C4603C",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "55bba911-f01e-0010-733c-410fd9000000",
-      "x-ms-client-request-id" : "cd70ef2b-a674-4d90-b149-86157a04d068",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "a1f88672-e01e-005e-04ff-483122000000",
+      "x-ms-client-request-id" : "6ef2c91d-2102-448c-bf75-852baa749614",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e17842100e1784210b3d645596954418c8a12467f89e/e17842101e1784210b3d78210f3d5e7577f9e4189890",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e17842100e17842105ee663292ccaab6851844ba8a37/e17842101e17842105ee601111087c27d9fb14a109dc",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2ec921dc-1fc8-49ee-8649-226b0b9ad6f8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "952b4721-592a-441d-8e90-c541ad82e366",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6459080Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A94CB61",
-      "x-ms-request-id" : "f2c2d882-a01e-001d-5d3c-41c70d000000",
-      "x-ms-client-request-id" : "2ec921dc-1fc8-49ee-8649-226b0b9ad6f8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=e1784210",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5984e2fb-fb4e-4100-bdda-429237f0e8ad"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "2772790f-401e-0048-1c3c-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>e1784210</Prefix><Containers><Container><Name>e17842100e1784210b3d645596954418c8a12467f89e</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A8866AF\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "5984e2fb-fb4e-4100-bdda-429237f0e8ad",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e17842100e1784210b3d645596954418c8a12467f89e?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6ef11d1b-9ded-448a-a02b-6a01b9b9262a"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "1b7e3fde-701e-0031-243c-412ba2000000",
-      "x-ms-client-request-id" : "6ef11d1b-9ded-448a-a02b-6a01b9b9262a",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT"
+      "eTag" : "0x8D9171687E79FC8",
+      "x-ms-request-id" : "acc125ef-e01e-0095-4cff-483277000000",
+      "x-ms-client-request-id" : "952b4721-592a-441d-8e90-c541ad82e366"
     },
     "Exception" : null
   } ],
-  "variables" : [ "e17842100e1784210b3d645596954418c8a12467f89e", "e17842101e1784210b3d78210f3d5e7577f9e4189890" ]
+  "variables" : [ "e17842100e17842105ee663292ccaab6851844ba8a37", "e17842101e17842105ee601111087c27d9fb14a109dc" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[13].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[13].json
index 7f0ff60d4bd6..126ddc147ec8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[13].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[13].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f86373510f86373511c584886a85669bbbc284a89894?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f86373510f86373517a4903577eed2895f7f7432ebe9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6e586091-367e-4aca-9439-a77fbfd5c188"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6068b7b1-a4e1-4873-aab0-2c11a5b99bda"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A8E2C1B",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687C46586",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8783d5bc-c01e-0079-603c-413695000000",
-      "x-ms-client-request-id" : "6e586091-367e-4aca-9439-a77fbfd5c188",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "0257505d-b01e-0088-0cff-483fcb000000",
+      "x-ms-client-request-id" : "6068b7b1-a4e1-4873-aab0-2c11a5b99bda",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f86373510f86373511c584886a85669bbbc284a89894/f86373511f86373511c54356773c85512f0014d319fd",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f86373510f86373517a4903577eed2895f7f7432ebe9/f86373511f86373517a470380810558f230f3460aa53",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "01b28ca9-fa12-4bee-aadb-ef2fd5b3e4b6",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "df33cf5a-0f89-4972-9d13-d3a3373aa3b8",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6519123Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A99D55B",
-      "x-ms-request-id" : "9e561ba9-901e-0039-703c-4131ad000000",
-      "x-ms-client-request-id" : "01b28ca9-fa12-4bee-aadb-ef2fd5b3e4b6"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=f8637351",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "26777a38-581d-48ef-836e-60f715d8ec75"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "7076f405-b01e-002e-293c-4198a6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>f8637351</Prefix><Containers><Container><Name>f86373510f86373511c584886a85669bbbc284a89894</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A8E2C1B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "26777a38-581d-48ef-836e-60f715d8ec75",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f86373510f86373511c584886a85669bbbc284a89894?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ec3e0229-b2d9-4f11-bd1d-6a786e6acd71"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "f24fbae2-701e-000e-733c-41e301000000",
-      "x-ms-client-request-id" : "ec3e0229-b2d9-4f11-bd1d-6a786e6acd71",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT"
+      "eTag" : "0x8D9171687E88A53",
+      "x-ms-request-id" : "49ad3cab-601e-008b-27ff-48deaf000000",
+      "x-ms-client-request-id" : "df33cf5a-0f89-4972-9d13-d3a3373aa3b8"
     },
     "Exception" : null
   } ],
-  "variables" : [ "f86373510f86373511c584886a85669bbbc284a89894", "f86373511f86373511c54356773c85512f0014d319fd" ]
+  "variables" : [ "f86373510f86373517a4903577eed2895f7f7432ebe9", "f86373511f86373517a470380810558f230f3460aa53" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[14].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[14].json
index 164ee3308972..a20d57a53c98 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[14].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[14].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b722e5960b722e5964773422292dd3fe4cdd6479db34?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b722e5960b722e59633650556143b21a63cf44638a05?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "42e2c525-1bde-4f26-be71-dca822cca765"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8e2ce1e5-4df3-4ef6-a18b-626c1202ff52"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A8FF3EE",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687C500BF",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "256c2ec0-301e-0052-1b3c-41b659000000",
-      "x-ms-client-request-id" : "42e2c525-1bde-4f26-be71-dca822cca765",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "487530ae-701e-0011-0fff-484076000000",
+      "x-ms-client-request-id" : "8e2ce1e5-4df3-4ef6-a18b-626c1202ff52",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b722e5960b722e5964773422292dd3fe4cdd6479db34/b722e5961b722e59647737467ec961db7fe0b4e14822",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b722e5960b722e59633650556143b21a63cf44638a05/b722e5961b722e59633646296a2db2cf15a9d408d99b",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d8863255-fc35-4d66-ab69-df7b8d1f23e0",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "af8b39b0-64f6-4307-8f37-af1ac6c341d7",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6519123Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A9DCDAE",
-      "x-ms-request-id" : "ce1b502e-a01e-0050-4b3c-4108e1000000",
-      "x-ms-client-request-id" : "d8863255-fc35-4d66-ab69-df7b8d1f23e0"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=b722e596",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4a663bcb-d982-4bbc-a883-16790a205f90"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "473f41fe-801e-001a-3c3c-41ab6e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>b722e596</Prefix><Containers><Container><Name>b722e5960b722e5964773422292dd3fe4cdd6479db34</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A8FF3EE\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4a663bcb-d982-4bbc-a883-16790a205f90",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b722e5960b722e5964773422292dd3fe4cdd6479db34?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8c51283a-33fe-4df6-8b43-783657407200"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e229e4ab-d01e-0017-143c-4163ba000000",
-      "x-ms-client-request-id" : "8c51283a-33fe-4df6-8b43-783657407200",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "eTag" : "0x8D9171687E88A53",
+      "x-ms-request-id" : "2290b804-d01e-0037-43ff-48086e000000",
+      "x-ms-client-request-id" : "af8b39b0-64f6-4307-8f37-af1ac6c341d7"
     },
     "Exception" : null
   } ],
-  "variables" : [ "b722e5960b722e5964773422292dd3fe4cdd6479db34", "b722e5961b722e59647737467ec961db7fe0b4e14822" ]
+  "variables" : [ "b722e5960b722e59633650556143b21a63cf44638a05", "b722e5961b722e59633646296a2db2cf15a9d408d99b" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[15].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[15].json
index 98c8eebeb3ab..3c962911dc59 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[15].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[15].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ae39d4d70ae39d4d76de46263d225bd0507c04363a99?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ae39d4d70ae39d4d75c5996653c0eecaa3d4340f5bb6?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b88dc5e8-4593-4a59-a09b-6e832e24b0bb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3046907e-cd6f-4034-8fff-98c909ede9e4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A91AF5A",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687CEC7A6",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "4124cfd9-101e-0045-0a3c-411f52000000",
-      "x-ms-client-request-id" : "b88dc5e8-4593-4a59-a09b-6e832e24b0bb",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "02575077-b01e-0088-20ff-483fcb000000",
+      "x-ms-client-request-id" : "3046907e-cd6f-4034-8fff-98c909ede9e4",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ae39d4d70ae39d4d76de46263d225bd0507c04363a99/ae39d4d71ae39d4d76de755969fa04c7ba0044a9480e",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ae39d4d70ae39d4d75c5996653c0eecaa3d4340f5bb6/ae39d4d71ae39d4d75c558622d9991b276a5f4e2c81f",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d394f72c-ae51-4544-95ce-93b1ac748fe8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f66c8d39-7e28-4d17-8c2e-f41dc943957f",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.7159578Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A9F0667",
-      "x-ms-request-id" : "8783d603-c01e-0079-203c-413695000000",
-      "x-ms-client-request-id" : "d394f72c-ae51-4544-95ce-93b1ac748fe8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ae39d4d7",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7ffc1443-34be-4165-a975-cddc4088f12d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "854b8ca6-501e-0036-453c-4147c1000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ae39d4d7</Prefix><Containers><Container><Name>ae39d4d70ae39d4d76de46263d225bd0507c04363a99</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A91AF5A\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "7ffc1443-34be-4165-a975-cddc4088f12d",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ae39d4d70ae39d4d76de46263d225bd0507c04363a99?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b89a49db-b0ba-47a0-8d31-75c24ebd8e31"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "f2c2d8a9-a01e-001d-7e3c-41c70d000000",
-      "x-ms-client-request-id" : "b89a49db-b0ba-47a0-8d31-75c24ebd8e31",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "eTag" : "0x8D9171687F2501A",
+      "x-ms-request-id" : "8fc45afc-e01e-0013-79ff-48fece000000",
+      "x-ms-client-request-id" : "f66c8d39-7e28-4d17-8c2e-f41dc943957f"
     },
     "Exception" : null
   } ],
-  "variables" : [ "ae39d4d70ae39d4d76de46263d225bd0507c04363a99", "ae39d4d71ae39d4d76de755969fa04c7ba0044a9480e" ]
+  "variables" : [ "ae39d4d70ae39d4d75c5996653c0eecaa3d4340f5bb6", "ae39d4d71ae39d4d75c558622d9991b276a5f4e2c81f" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[16].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[16].json
index c3df07d15cb0..957190f02945 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[16].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[16].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/851487140851487141344573503f94e49fa644412954?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/851487140851487147e651780046007ef0ecf4351aed?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2d540ea3-5fc1-404f-96a0-236b123b3d89"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6c6f4bb6-6896-408a-b72a-a05702b696c8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A9328D4",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687CC7138",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "7e5e898d-d01e-0075-563c-41a19d000000",
-      "x-ms-client-request-id" : "2d540ea3-5fc1-404f-96a0-236b123b3d89",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "6b1507b6-f01e-0089-30ff-486017000000",
+      "x-ms-client-request-id" : "6c6f4bb6-6896-408a-b72a-a05702b696c8",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/851487140851487141344573503f94e49fa644412954/85148714185148714134992250707724a340542c88df",
+    "Uri" : "https://REDACTED.blob.core.windows.net/851487140851487147e651780046007ef0ecf4351aed/851487141851487147e695817976cac8d7be64ef3960",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f6990d96-effe-46ff-b6e5-46273b7d4174",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0873058c-7660-4f50-a994-7be17d5281e0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6879379Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A9FA2C3",
-      "x-ms-request-id" : "a7b4c0ba-401e-0067-3a3c-41da4d000000",
-      "x-ms-client-request-id" : "f6990d96-effe-46ff-b6e5-46273b7d4174"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=85148714",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ef7a4bb7-94b3-45ac-bdc5-ef2d1eee0e65"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "408f0440-601e-0002-073c-417409000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>85148714</Prefix><Containers><Container><Name>851487140851487141344573503f94e49fa644412954</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A9328D4\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ef7a4bb7-94b3-45ac-bdc5-ef2d1eee0e65",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/851487140851487141344573503f94e49fa644412954?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e9ee548c-da01-4cc3-bc2b-c46b62a596e0"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "33355e5c-b01e-004c-693c-415a81000000",
-      "x-ms-client-request-id" : "e9ee548c-da01-4cc3-bc2b-c46b62a596e0",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687EDE27A",
+      "x-ms-request-id" : "a1f886ce-e01e-005e-56ff-483122000000",
+      "x-ms-client-request-id" : "0873058c-7660-4f50-a994-7be17d5281e0"
     },
     "Exception" : null
   } ],
-  "variables" : [ "851487140851487141344573503f94e49fa644412954", "85148714185148714134992250707724a340542c88df" ]
+  "variables" : [ "851487140851487147e651780046007ef0ecf4351aed", "851487141851487147e695817976cac8d7be64ef3960" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[17].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[17].json
index db742fb3d9e5..e1abfb146ae8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[17].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[17].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9c0fb65509c0fb655f7a680028d4444b4567e43c880f?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9c0fb65509c0fb65597e87461cf4e1dc3a7e840dba8d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "68c0c4f3-2776-48be-8e41-da1dfb7fe3ba"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "030fd0f1-06c3-47f8-b4a0-1d237724ba5c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A941ED8",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687CFB10D",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "95a55ec2-301e-0042-3d3c-417331000000",
-      "x-ms-client-request-id" : "68c0c4f3-2776-48be-8e41-da1dfb7fe3ba",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "487530c7-701e-0011-22ff-484076000000",
+      "x-ms-client-request-id" : "030fd0f1-06c3-47f8-b4a0-1d237724ba5c",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9c0fb65509c0fb655f7a680028d4444b4567e43c880f/9c0fb65519c0fb655f7a97159e77592c5bf82473eaa3",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9c0fb65509c0fb65597e87461cf4e1dc3a7e840dba8d/9c0fb65519c0fb65597e465160888d97c82414d8d9d6",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ee29919a-a26a-4fee-8ec5-ae46a7cb3deb",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6faf1b05-83ba-49c8-b00f-e16500ef9c1f",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.7149564Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538AA06634",
-      "x-ms-request-id" : "a4ebde13-001e-0004-0f3c-4147b6000000",
-      "x-ms-client-request-id" : "ee29919a-a26a-4fee-8ec5-ae46a7cb3deb"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=9c0fb655",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d5e5187a-4443-43b4-a863-bb99e127e0f9"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "098b73a3-b01e-0001-283c-41956d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>9c0fb655</Prefix><Containers><Container><Name>9c0fb65509c0fb655f7a680028d4444b4567e43c880f</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A941ED8\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "d5e5187a-4443-43b4-a863-bb99e127e0f9",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/9c0fb65509c0fb655f7a680028d4444b4567e43c880f?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "df15cdfe-1f7a-4b5e-b2c9-21d3a3f79511"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "98a02930-601e-002d-413c-4179c2000000",
-      "x-ms-client-request-id" : "df15cdfe-1f7a-4b5e-b2c9-21d3a3f79511",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687F228FC",
+      "x-ms-request-id" : "acc12607-e01e-0095-62ff-483277000000",
+      "x-ms-client-request-id" : "6faf1b05-83ba-49c8-b00f-e16500ef9c1f"
     },
     "Exception" : null
   } ],
-  "variables" : [ "9c0fb65509c0fb655f7a680028d4444b4567e43c880f", "9c0fb65519c0fb655f7a97159e77592c5bf82473eaa3" ]
+  "variables" : [ "9c0fb65509c0fb65597e87461cf4e1dc3a7e840dba8d", "9c0fb65519c0fb65597e465160888d97c82414d8d9d6" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[1].json
index f85b336c1e55..83dda246e372 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[1].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[1].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a4bd04f90a4bd04f945110753beb5f575173a4154b3d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a4bd04f90a4bd04f9719945329d1af9c9172941dbbc0?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0e3e919b-b663-4d2b-9aac-73df83b7ad60"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "003e814b-4af9-434c-a778-ac3bf4bf0256"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A2EA5D5",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A91832",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e229e28f-d01e-0017-493c-4163ba000000",
-      "x-ms-client-request-id" : "0e3e919b-b663-4d2b-9aac-73df83b7ad60",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT"
+      "x-ms-request-id" : "e8a1e0b0-201e-0033-2aff-488569000000",
+      "x-ms-client-request-id" : "003e814b-4af9-434c-a778-ac3bf4bf0256",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a4bd04f90a4bd04f945110753beb5f575173a4154b3d/a4bd04f91a4bd04f9451059058b720b25e8674d48b9d",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a4bd04f90a4bd04f9719945329d1af9c9172941dbbc0/a4bd04f91a4bd04f97193457717d7c566e3494390833",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6a35c708-73b1-4bed-a3df-abe60f56a532",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ebefc4f4-5863-4b0e-b5b1-46703313ebd2",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4600654Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A3B026D",
-      "x-ms-request-id" : "6c1f389f-801e-0078-3a3c-416949000000",
-      "x-ms-client-request-id" : "6a35c708-73b1-4bed-a3df-abe60f56a532"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=a4bd04f9",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6e6c4fb8-f835-4ba1-b68d-4fad6bda629d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "32600940-e01e-0041-073c-419255000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>a4bd04f9</Prefix><Containers><Container><Name>a4bd04f90a4bd04f945110753beb5f575173a4154b3d</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A2EA5D5\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "6e6c4fb8-f835-4ba1-b68d-4fad6bda629d",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a4bd04f90a4bd04f945110753beb5f575173a4154b3d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "743d9141-a37f-4255-b5c7-ee57b216d893"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "89598eb6-401e-002a-443c-4115a1000000",
-      "x-ms-client-request-id" : "743d9141-a37f-4255-b5c7-ee57b216d893",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D917168732ADCE",
+      "x-ms-request-id" : "6b1506ba-f01e-0089-61ff-486017000000",
+      "x-ms-client-request-id" : "ebefc4f4-5863-4b0e-b5b1-46703313ebd2"
     },
     "Exception" : null
   } ],
-  "variables" : [ "a4bd04f90a4bd04f945110753beb5f575173a4154b3d", "a4bd04f91a4bd04f9451059058b720b25e8674d48b9d" ]
+  "variables" : [ "a4bd04f90a4bd04f9719945329d1af9c9172941dbbc0", "a4bd04f91a4bd04f97193457717d7c566e3494390833" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[2].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[2].json
index 37fa8327e8a3..d2bc56603585 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[2].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[2].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f90573a08f90573ad4a35276974f6211ac1c4f7c8db?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8f90573a08f90573a01d74957268aa5ef925c42adaeb?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f55a00ce-c8ef-44d3-a489-6f1c21b2d3d4"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a5672d40-6b3b-4d65-8e24-3279b5e567bc"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A2FA022",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A61D24",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e4e43f56-701e-001e-2c3c-412669000000",
-      "x-ms-client-request-id" : "f55a00ce-c8ef-44d3-a489-6f1c21b2d3d4",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "e8e9e210-901e-0009-32ff-489f11000000",
+      "x-ms-client-request-id" : "a5672d40-6b3b-4d65-8e24-3279b5e567bc",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f90573a08f90573ad4a35276974f6211ac1c4f7c8db/8f90573a18f90573ad4a9844342f48990ca0c4d80a47",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8f90573a08f90573a01d74957268aa5ef925c42adaeb/8f90573a18f90573a01d41905d4be0ac66d8541f89a4",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0e6397e1-7c3d-4279-a177-e3913b897aca",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7bc8d865-5e8c-4484-8b7a-04ca1c45e840",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1588517Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A3B77B9",
-      "x-ms-request-id" : "8783d462-c01e-0079-293c-413695000000",
-      "x-ms-client-request-id" : "0e6397e1-7c3d-4279-a177-e3913b897aca"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=8f90573a",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c473f7ec-9cb1-4aa9-87e8-ccf8e77186c1"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "c27f2c82-b01e-005c-023c-419fe9000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>8f90573a</Prefix><Containers><Container><Name>8f90573a08f90573ad4a35276974f6211ac1c4f7c8db</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A2FA022\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c473f7ec-9cb1-4aa9-87e8-ccf8e77186c1",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8f90573a08f90573ad4a35276974f6211ac1c4f7c8db?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5cad8757-2abb-48f0-b207-df1f8ac01841"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "cd53c264-c01e-001b-583c-41f4b2000000",
-      "x-ms-client-request-id" : "5cad8757-2abb-48f0-b207-df1f8ac01841",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT"
+      "eTag" : "0x8D917168704B7A5",
+      "x-ms-request-id" : "5de8200b-a01e-003d-7bff-48acd9000000",
+      "x-ms-client-request-id" : "7bc8d865-5e8c-4484-8b7a-04ca1c45e840"
     },
     "Exception" : null
   } ],
-  "variables" : [ "8f90573a08f90573ad4a35276974f6211ac1c4f7c8db", "8f90573a18f90573ad4a9844342f48990ca0c4d80a47" ]
+  "variables" : [ "8f90573a08f90573a01d74957268aa5ef925c42adaeb", "8f90573a18f90573a01d41905d4be0ac66d8541f89a4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[3].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[3].json
index 6b2e01bd6665..1df00b8a9388 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[3].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[3].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/968b667b0968b667b24a24129de96cc6cb8d34f2e9ab?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/968b667b0968b667b7f8642473040c30cba8a4bec902?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0042f3cb-d01e-46b0-b7bf-f4023823dbd8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "311facda-3ce6-421f-b738-8b72474c2e02"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A30365C",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686CDCABC",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "7e5e8939-d01e-0075-123c-41a19d000000",
-      "x-ms-client-request-id" : "0042f3cb-d01e-46b0-b7bf-f4023823dbd8",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "02574f68-b01e-0088-4fff-483fcb000000",
+      "x-ms-client-request-id" : "311facda-3ce6-421f-b738-8b72474c2e02",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/968b667b0968b667b24a24129de96cc6cb8d34f2e9ab/968b667b1968b667b24a41228c37b3b5a82db4ecc8aa",
+    "Uri" : "https://REDACTED.blob.core.windows.net/968b667b0968b667b7f8642473040c30cba8a4bec902/968b667b1968b667b7f897534bbabadcdcad64f15b7f",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f5c3be11-301f-42b1-8538-046de705766e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0c640552-2515-457a-9369-0fe6d59a4f19",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2449124Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A3BED00",
-      "x-ms-request-id" : "4124cf19-101e-0045-6f3c-411f52000000",
-      "x-ms-client-request-id" : "f5c3be11-301f-42b1-8538-046de705766e"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=968b667b",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b34e9638-0b01-4a5a-80fd-93c8ed822477"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "854b8a9e-501e-0036-7f3c-4147c1000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>968b667b</Prefix><Containers><Container><Name>968b667b0968b667b24a24129de96cc6cb8d34f2e9ab</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A30365C\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "b34e9638-0b01-4a5a-80fd-93c8ed822477",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/968b667b0968b667b24a24129de96cc6cb8d34f2e9ab?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e4a22512-2c63-4592-9008-273aa0d6c1a5"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "fe6d455a-501e-0044-4d3c-41408e000000",
-      "x-ms-client-request-id" : "e4a22512-2c63-4592-9008-273aa0d6c1a5",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D917168711B24F",
+      "x-ms-request-id" : "acc12413-e01e-0095-33ff-483277000000",
+      "x-ms-client-request-id" : "0c640552-2515-457a-9369-0fe6d59a4f19"
     },
     "Exception" : null
   } ],
-  "variables" : [ "968b667b0968b667b24a24129de96cc6cb8d34f2e9ab", "968b667b1968b667b24a41228c37b3b5a82db4ecc8aa" ]
+  "variables" : [ "968b667b0968b667b7f8642473040c30cba8a4bec902", "968b667b1968b667b7f897534bbabadcdcad64f15b7f" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[4].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[4].json
index 36679639a491..07e65f8d091f 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[4].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[4].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d9caf0bc0d9caf0bc3db0341451574c4fe70e4200b15?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d9caf0bc0d9caf0bc166539217843853567814fa48fe?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9b526068-b183-4c7f-b1f2-027029ef7b78"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2a15275f-0fc1-44e0-ba9c-006b2830a5fb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A60A966",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A92450",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "95a55d9e-301e-0042-443c-417331000000",
-      "x-ms-client-request-id" : "9b526068-b183-4c7f-b1f2-027029ef7b78",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "acb29ba8-d01e-007a-61ff-48c782000000",
+      "x-ms-client-request-id" : "2a15275f-0fc1-44e0-ba9c-006b2830a5fb",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d9caf0bc0d9caf0bc3db0341451574c4fe70e4200b15/d9caf0bc1d9caf0bc3db198825f9b407a04fa4c10a1a",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d9caf0bc0d9caf0bc166539217843853567814fa48fe/d9caf0bc1d9caf0bc16658602cb8c33c679cf48d5b98",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a51c6454-3ebc-413a-a42b-994526613452",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "52749072-bc08-4442-8888-5ee15f7570ed",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2829398Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A6C5483",
-      "x-ms-request-id" : "4661cb35-b01e-0063-543c-41574a000000",
-      "x-ms-client-request-id" : "a51c6454-3ebc-413a-a42b-994526613452"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=d9caf0bc",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4f54c2a2-804a-4980-ab1c-dfcc45df1b9f"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "89598f98-401e-002a-7e3c-4115a1000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>d9caf0bc</Prefix><Containers><Container><Name>d9caf0bc0d9caf0bc3db0341451574c4fe70e4200b15</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A60A966\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4f54c2a2-804a-4980-ab1c-dfcc45df1b9f",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d9caf0bc0d9caf0bc3db0341451574c4fe70e4200b15?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cfca561d-972f-42e6-b04a-f08ec7d6eb6a"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "7076f327-b01e-002e-643c-4198a6000000",
-      "x-ms-client-request-id" : "cfca561d-972f-42e6-b04a-f08ec7d6eb6a",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D917168717A6D6",
+      "x-ms-request-id" : "2290b598-d01e-0037-16ff-48086e000000",
+      "x-ms-client-request-id" : "52749072-bc08-4442-8888-5ee15f7570ed"
     },
     "Exception" : null
   } ],
-  "variables" : [ "d9caf0bc0d9caf0bc3db0341451574c4fe70e4200b15", "d9caf0bc1d9caf0bc3db198825f9b407a04fa4c10a1a" ]
+  "variables" : [ "d9caf0bc0d9caf0bc166539217843853567814fa48fe", "d9caf0bc1d9caf0bc16658602cb8c33c679cf48d5b98" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[5].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[5].json
index a0eb716878f4..740f22c5c0f8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[5].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[5].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c0d1c1fd0c0d1c1fd380724106b96d6bbdbae4444b7e?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c0d1c1fd0c0d1c1fd7b7012990de6be4b13f541b6ac4?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e575a11f-48c1-4b9a-85f6-535f6d3cbeea"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4665a8a8-1450-42e1-a412-a51dc0c696d6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A60C508",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687BA457C",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "7e5e8966-d01e-0075-343c-41a19d000000",
-      "x-ms-client-request-id" : "e575a11f-48c1-4b9a-85f6-535f6d3cbeea",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "6b150798-f01e-0089-17ff-486017000000",
+      "x-ms-client-request-id" : "4665a8a8-1450-42e1-a412-a51dc0c696d6",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c0d1c1fd0c0d1c1fd380724106b96d6bbdbae4444b7e/c0d1c1fd1c0d1c1fd380189158c9ae6626e8d478ebde",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c0d1c1fd0c0d1c1fd7b7012990de6be4b13f541b6ac4/c0d1c1fd1c0d1c1fd7b777112ee005d10e562443b8df",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9f3104ee-5f6a-47fd-b4c9-8dde6a728b8d",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "244b3cd6-4d99-488b-bebf-8341a30de8ed",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.5668517Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A6C5483",
-      "x-ms-request-id" : "baa3cd12-101e-0008-173c-41d0be000000",
-      "x-ms-client-request-id" : "9f3104ee-5f6a-47fd-b4c9-8dde6a728b8d"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=c0d1c1fd",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3e76e3b9-f483-4438-92c0-ed1beeacc2ee"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "a671d285-601e-0070-6d3c-417346000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>c0d1c1fd</Prefix><Containers><Container><Name>c0d1c1fd0c0d1c1fd380724106b96d6bbdbae4444b7e</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A60C508\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3e76e3b9-f483-4438-92c0-ed1beeacc2ee",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c0d1c1fd0c0d1c1fd380724106b96d6bbdbae4444b7e?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6f208701-5b9d-401f-90e5-d6c852bec3ab"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "7e5e8974-d01e-0075-413c-41a19d000000",
-      "x-ms-client-request-id" : "6f208701-5b9d-401f-90e5-d6c852bec3ab",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687DB8FA5",
+      "x-ms-request-id" : "acb29d62-d01e-007a-53ff-48c782000000",
+      "x-ms-client-request-id" : "244b3cd6-4d99-488b-bebf-8341a30de8ed"
     },
     "Exception" : null
   } ],
-  "variables" : [ "c0d1c1fd0c0d1c1fd380724106b96d6bbdbae4444b7e", "c0d1c1fd1c0d1c1fd380189158c9ae6626e8d478ebde" ]
+  "variables" : [ "c0d1c1fd0c0d1c1fd7b7012990de6be4b13f541b6ac4", "c0d1c1fd1c0d1c1fd7b777112ee005d10e562443b8df" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[6].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[6].json
index c8a1775d8532..d89f33837022 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[6].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[6].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ebfc923e0ebfc923ebc304381e0c3a77f144b4535b44?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ebfc923e0ebfc923e4f09430832cda07337b44089b60?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "70fd87c7-83db-4ac8-be30-0b012acd652b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c52dc2b1-29e7-4d6c-89c1-af0b5625d87e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A65B4A3",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687BA9FBA",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "fe6d45a4-501e-0044-073c-41408e000000",
-      "x-ms-client-request-id" : "70fd87c7-83db-4ac8-be30-0b012acd652b",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "02575052-b01e-0088-02ff-483fcb000000",
+      "x-ms-client-request-id" : "c52dc2b1-29e7-4d6c-89c1-af0b5625d87e",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ebfc923e0ebfc923ebc304381e0c3a77f144b4535b44/ebfc923e1ebfc923ebc303075bf5b191100ca4dbf8b5",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ebfc923e0ebfc923e4f09430832cda07337b44089b60/ebfc923e1ebfc923e4f070035607310ac251b4e88984",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "54d64d44-2f14-4ade-be89-537eceb9603f",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "05ea04cc-c31c-4001-9fbf-c4441c97ca7d",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.5678521Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A71FADA",
-      "x-ms-request-id" : "c7988558-901e-0064-473c-413b29000000",
-      "x-ms-client-request-id" : "54d64d44-2f14-4ade-be89-537eceb9603f"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ebfc923e",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eb9fe7dc-63df-4e4d-8ce5-094fdc51c9ce"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "baa3cd3d-101e-0008-3e3c-41d0be000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ebfc923e</Prefix><Containers><Container><Name>ebfc923e0ebfc923ebc304381e0c3a77f144b4535b44</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A65B4A3\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "eb9fe7dc-63df-4e4d-8ce5-094fdc51c9ce",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ebfc923e0ebfc923ebc304381e0c3a77f144b4535b44?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fbb2bb51-e81c-496d-a2e2-4706f7f03bfd"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "80c6babc-b01e-0073-5f3c-419222000000",
-      "x-ms-client-request-id" : "fbb2bb51-e81c-496d-a2e2-4706f7f03bfd",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687DBB6B9",
+      "x-ms-request-id" : "2290b7e4-d01e-0037-27ff-48086e000000",
+      "x-ms-client-request-id" : "05ea04cc-c31c-4001-9fbf-c4441c97ca7d"
     },
     "Exception" : null
   } ],
-  "variables" : [ "ebfc923e0ebfc923ebc304381e0c3a77f144b4535b44", "ebfc923e1ebfc923ebc303075bf5b191100ca4dbf8b5" ]
+  "variables" : [ "ebfc923e0ebfc923e4f09430832cda07337b44089b60", "ebfc923e1ebfc923e4f070035607310ac251b4e88984" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[7].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[7].json
index 5065da8529d4..24f04a3ba87e 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[7].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[7].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f2e7a37f0f2e7a37fd4562872a579a7f5a0e7486e8b1?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f2e7a37f0f2e7a37fbda54833431680bd781b4b0ab7c?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "947e944a-7505-4c0d-a157-fce9f8a6c7c5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2571e945-4006-4ac0-b311-ee93419671d2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A673163",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687B9FE13",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "80c6ba62-b01e-0073-173c-419222000000",
-      "x-ms-client-request-id" : "947e944a-7505-4c0d-a157-fce9f8a6c7c5",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "a1f8865c-e01e-005e-70ff-483122000000",
+      "x-ms-client-request-id" : "2571e945-4006-4ac0-b311-ee93419671d2",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f2e7a37f0f2e7a37fd4562872a579a7f5a0e7486e8b1/f2e7a37f1f2e7a37fd45473935c028c7f6f76496380e",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f2e7a37f0f2e7a37fbda54833431680bd781b4b0ab7c/f2e7a37f1f2e7a37fbda20880d30bbbe5a3664c7e906",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ed87d4a4-59c9-444c-b33a-bd7398fa764f",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f2f4a8a4-afa6-48ab-843d-3025b2d5e274",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.5668517Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A72BE50",
-      "x-ms-request-id" : "7e5e896e-d01e-0075-3b3c-41a19d000000",
-      "x-ms-client-request-id" : "ed87d4a4-59c9-444c-b33a-bd7398fa764f"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=f2e7a37f",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2e038562-47c2-4601-bf2d-7410eb105589"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "2824de70-401e-003a-343c-41d0c9000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>f2e7a37f</Prefix><Containers><Container><Name>f2e7a37f0f2e7a37fd4562872a579a7f5a0e7486e8b1</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A673163\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2e038562-47c2-4601-bf2d-7410eb105589",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/f2e7a37f0f2e7a37fd4562872a579a7f5a0e7486e8b1?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e82fb0db-7f67-4c83-a1c7-fca1a45f96b6"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "07eb621d-501e-0019-7a3c-414a0a000000",
-      "x-ms-client-request-id" : "e82fb0db-7f67-4c83-a1c7-fca1a45f96b6",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687DB8FA5",
+      "x-ms-request-id" : "49ad3c8a-601e-008b-06ff-48deaf000000",
+      "x-ms-client-request-id" : "f2f4a8a4-afa6-48ab-843d-3025b2d5e274"
     },
     "Exception" : null
   } ],
-  "variables" : [ "f2e7a37f0f2e7a37fd4562872a579a7f5a0e7486e8b1", "f2e7a37f1f2e7a37fd45473935c028c7f6f76496380e" ]
+  "variables" : [ "f2e7a37f0f2e7a37fbda54833431680bd781b4b0ab7c", "f2e7a37f1f2e7a37fbda20880d30bbbe5a3664c7e906" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[8].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[8].json
index 1b5a8a296a01..4320466da8fa 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[8].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[8].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/757fbfb00757fbfb028683182950ff4585d3b43d39aa?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/757fbfb00757fbfb062f17157676a5df6abeb4f99a25?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4f89666a-3e89-4f41-8076-c382488fff02"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7e9a4e4d-861e-4bfb-a3fb-91de56c0af95"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A6A51D4",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687B9D60B",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "098b72f1-b01e-0001-153c-41956d000000",
-      "x-ms-client-request-id" : "4f89666a-3e89-4f41-8076-c382488fff02",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "8fc45a4d-e01e-0013-5fff-48fece000000",
+      "x-ms-client-request-id" : "7e9a4e4d-861e-4bfb-a3fb-91de56c0af95",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/757fbfb00757fbfb028683182950ff4585d3b43d39aa/757fbfb01757fbfb028639404ddc45e70d40a41548db",
+    "Uri" : "https://REDACTED.blob.core.windows.net/757fbfb00757fbfb062f17157676a5df6abeb4f99a25/757fbfb01757fbfb062f836138d0ed2b90fc74b8bb15",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6eb49cd6-4b2e-47f4-928e-da049b55e2ac",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "372ac4d4-f68d-4345-bcb1-2377c0b0ea00",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.5598469Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A76415B",
-      "x-ms-request-id" : "9d2c79cb-001e-0066-713c-418591000000",
-      "x-ms-client-request-id" : "6eb49cd6-4b2e-47f4-928e-da049b55e2ac"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=757fbfb0",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "66d87565-b893-4002-9cf3-a4d5b182a600"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "3ba86a44-d01e-005a-013c-41ac56000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>757fbfb0</Prefix><Containers><Container><Name>757fbfb00757fbfb028683182950ff4585d3b43d39aa</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A6A51D4\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "66d87565-b893-4002-9cf3-a4d5b182a600",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/757fbfb00757fbfb028683182950ff4585d3b43d39aa?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eca24e97-b4b7-4288-b5be-8f74389cbb2f"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "62c6f606-201e-0003-1d3c-412bd5000000",
-      "x-ms-client-request-id" : "eca24e97-b4b7-4288-b5be-8f74389cbb2f",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687DA7E05",
+      "x-ms-request-id" : "487530e5-701e-0011-3bff-484076000000",
+      "x-ms-client-request-id" : "372ac4d4-f68d-4345-bcb1-2377c0b0ea00"
     },
     "Exception" : null
   } ],
-  "variables" : [ "757fbfb00757fbfb028683182950ff4585d3b43d39aa", "757fbfb01757fbfb028639404ddc45e70d40a41548db" ]
+  "variables" : [ "757fbfb00757fbfb062f17157676a5df6abeb4f99a25", "757fbfb01757fbfb062f836138d0ed2b90fc74b8bb15" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[9].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[9].json
index 4cb450506e90..ddc8f66ab07d 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[9].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSignUserDelegationKey[9].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6c648ef106c648ef11298193588357a739e1141b7b07?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6c648ef106c648ef16df058883cd33562733a420ea3a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b59dd087-2ea6-436e-adaa-e308a1cdd3b2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6165624b-5f20-40ec-ae81-34ca2f85c331"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A6AADA4",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171687BA023F",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "9e561b86-901e-0039-573c-4131ad000000",
-      "x-ms-client-request-id" : "b59dd087-2ea6-436e-adaa-e308a1cdd3b2",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "487530a5-701e-0011-07ff-484076000000",
+      "x-ms-client-request-id" : "6165624b-5f20-40ec-ae81-34ca2f85c331",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6c648ef106c648ef11298193588357a739e1141b7b07/6c648ef116c648ef1129486030247396b676542b3898",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6c648ef106c648ef16df058883cd33562733a420ea3a/6c648ef116c648ef16df5150136d2059dee3442c08e0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b428d1d3-0dd8-47f5-bc5c-ad8f846f89a5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fafc689b-84f3-4c9a-8be0-1e172e0109dd",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6609189Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A766874",
-      "x-ms-request-id" : "2e9fc440-701e-006c-543c-412126000000",
-      "x-ms-client-request-id" : "b428d1d3-0dd8-47f5-bc5c-ad8f846f89a5"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=6c648ef1",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "93062dba-46a0-4ec3-9d1a-c04a3105892b"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "256c2e65-301e-0052-4b3c-41b659000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>6c648ef1</Prefix><Containers><Container><Name>6c648ef106c648ef11298193588357a739e1141b7b07</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A6AADA4\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "93062dba-46a0-4ec3-9d1a-c04a3105892b",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6c648ef106c648ef11298193588357a739e1141b7b07?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "856353e9-6231-46e4-8fb8-38de42655cb1"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "189c1be4-601e-0060-023c-41b62e000000",
-      "x-ms-client-request-id" : "856353e9-6231-46e4-8fb8-38de42655cb1",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687E9EA25",
+      "x-ms-request-id" : "53854a43-d01e-0045-3fff-480f21000000",
+      "x-ms-client-request-id" : "fafc689b-84f3-4c9a-8be0-1e172e0109dd"
     },
     "Exception" : null
   } ],
-  "variables" : [ "6c648ef106c648ef11298193588357a739e1141b7b07", "6c648ef116c648ef1129486030247396b676542b3898" ]
+  "variables" : [ "6c648ef106c648ef16df058883cd33562733a420ea3a", "6c648ef116c648ef16df5150136d2059dee3442c08e0" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[0].json
index c49f4927908a..2555c2a52dec 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[0].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[0].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/122ab3e20122ab3e2c0d074565fae651e07a24d69b37?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/122ab3e20122ab3e297c312729c3a1aa59e0843f9a3d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d5d2baf1-cfdd-4969-bddb-00cf7952999f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b3132356-573d-477d-8af7-338ab3ae588c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A30904A",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A61BC9",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "9d2c78e1-001e-0066-273c-418591000000",
-      "x-ms-client-request-id" : "d5d2baf1-cfdd-4969-bddb-00cf7952999f",
-      "Date" : "Tue, 04 May 2021 23:22:51 GMT"
+      "x-ms-request-id" : "20e5788b-001e-008d-5eff-48ed10000000",
+      "x-ms-client-request-id" : "b3132356-573d-477d-8af7-338ab3ae588c",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/122ab3e20122ab3e2c0d074565fae651e07a24d69b37/122ab3e21122ab3e2c0d57441a232e429c87a43c1b21",
+    "Uri" : "https://REDACTED.blob.core.windows.net/122ab3e20122ab3e297c312729c3a1aa59e0843f9a3d/122ab3e21122ab3e297c825940a00902f04864651b5a",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b2c8c912-e465-44da-ae5e-b094d3496ef8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "955f39c3-2b28-4c55-bd81-d31b206c98ea",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4830820Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A3BED00",
-      "x-ms-request-id" : "5d231263-d01e-0065-0b3c-4164f5000000",
-      "x-ms-client-request-id" : "b2c8c912-e465-44da-ae5e-b094d3496ef8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=122ab3e2",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ad2fd4a0-9de5-4180-8373-963574e915a8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "07eb61a1-501e-0019-223c-414a0a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>122ab3e2</Prefix><Containers><Container><Name>122ab3e20122ab3e2c0d074565fae651e07a24d69b37</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A30904A\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ad2fd4a0-9de5-4180-8373-963574e915a8",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/122ab3e20122ab3e2c0d074565fae651e07a24d69b37?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cd13df09-a88d-4cfc-9719-ede4bae17967"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "a671d227-601e-0070-243c-417346000000",
-      "x-ms-client-request-id" : "cd13df09-a88d-4cfc-9719-ede4bae17967",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D91716873630E4",
+      "x-ms-request-id" : "5de8204b-a01e-003d-2fff-48acd9000000",
+      "x-ms-client-request-id" : "955f39c3-2b28-4c55-bd81-d31b206c98ea"
     },
     "Exception" : null
   } ],
-  "variables" : [ "122ab3e20122ab3e2c0d074565fae651e07a24d69b37", "122ab3e21122ab3e2c0d57441a232e429c87a43c1b21" ]
+  "variables" : [ "122ab3e20122ab3e297c312729c3a1aa59e0843f9a3d", "122ab3e21122ab3e297c825940a00902f04864651b5a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[10].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[10].json
index d1a7257b6e86..4e6402a32904 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[10].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[10].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/585f14fe0585f14fe3cd936942b81e4aa3a334e37ab7?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/585f14fe0585f14fedab22462e2fb4d431cf7419a8bc?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "307e7056-4a7a-4347-8978-0dfd0cae6d3b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fab77907-3af1-48af-a36f-2a4b0d3a6409"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538BF97ADD",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "eTag" : "0x8D9171687C70C30",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6c1f3e92-801e-0078-623c-416949000000",
-      "x-ms-client-request-id" : "307e7056-4a7a-4347-8978-0dfd0cae6d3b",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "x-ms-request-id" : "49ad3c22-601e-008b-26ff-48deaf000000",
+      "x-ms-client-request-id" : "fab77907-3af1-48af-a36f-2a4b0d3a6409",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/585f14fe0585f14fe3cd936942b81e4aa3a334e37ab7/585f14fe1585f14fe3cd384669041fefd5593497898f",
+    "Uri" : "https://REDACTED.blob.core.windows.net/585f14fe0585f14fedab22462e2fb4d431cf7419a8bc/585f14fe1585f14fedab7684435736e0839674e59a50",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "11601abc-4301-42e4-b9e0-be695740c604",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "979ef31a-4b43-48b4-a546-08f81b8347f3",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6479099Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538C053F99",
-      "x-ms-request-id" : "2824e4ce-401e-003a-363c-41d0c9000000",
-      "x-ms-client-request-id" : "11601abc-4301-42e4-b9e0-be695740c604"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=585f14fe",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b8019479-6d7f-44b2-8d38-ff3cb42434d4"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "1385c6ec-801e-0068-2b3c-41ac21000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>585f14fe</Prefix><Containers><Container><Name>585f14fe0585f14fe3cd936942b81e4aa3a334e37ab7</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:55 GMT</Last-Modified><Etag>\"0x8D90F538BF97ADD\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "b8019479-6d7f-44b2-8d38-ff3cb42434d4",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/585f14fe0585f14fe3cd936942b81e4aa3a334e37ab7?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b1386234-704d-4f0b-8b56-65887af3164b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e8ca4704-c01e-000b-5f3c-4131da000000",
-      "x-ms-client-request-id" : "b1386234-704d-4f0b-8b56-65887af3164b",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "eTag" : "0x8D9171687E7EDFB",
+      "x-ms-request-id" : "acb29d70-d01e-007a-60ff-48c782000000",
+      "x-ms-client-request-id" : "979ef31a-4b43-48b4-a546-08f81b8347f3"
     },
     "Exception" : null
   } ],
-  "variables" : [ "585f14fe0585f14fe3cd936942b81e4aa3a334e37ab7", "585f14fe1585f14fe3cd384669041fefd5593497898f" ]
+  "variables" : [ "585f14fe0585f14fedab22462e2fb4d431cf7419a8bc", "585f14fe1585f14fedab7684435736e0839674e59a50" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[1].json
index ad9c4a7525ab..d59e99aede34 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[1].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[1].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0b3182a300b3182a30d40214494d0d19c8da54117b2f?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0b3182a300b3182a3ece024749c2e43c96a39484d8d9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f4f9b398-2c4f-4780-b2a8-a92b6a1083b4"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f59d0ab7-3c87-44f6-b649-427a6a660b4e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A6198DA",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A5C5A9",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "237a0df9-001e-003b-613c-418f15000000",
-      "x-ms-client-request-id" : "f4f9b398-2c4f-4780-b2a8-a92b6a1083b4",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "1bb9d266-001e-0056-42ff-482b2d000000",
+      "x-ms-client-request-id" : "f59d0ab7-3c87-44f6-b649-427a6a660b4e",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0b3182a300b3182a30d40214494d0d19c8da54117b2f/0b3182a310b3182a30d4630313dbd41e1e84c4628bb5",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0b3182a300b3182a3ece024749c2e43c96a39484d8d9/0b3182a310b3182a3ece75707a139a7db339146f995f",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "88ded0f0-cdd0-4870-b797-8df24c8750d6",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "55592567-5eb4-47ae-ae44-9c77ee563e1a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1438412Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A6F624C",
-      "x-ms-request-id" : "b1fb0b69-201e-003c-2b3c-41e376000000",
-      "x-ms-client-request-id" : "88ded0f0-cdd0-4870-b797-8df24c8750d6"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=0b3182a3",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "09daf04e-7e2d-4fcd-a9bb-e4d436f35f75"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "408f034d-601e-0002-3e3c-417409000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>0b3182a3</Prefix><Containers><Container><Name>0b3182a300b3182a30d40214494d0d19c8da54117b2f</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A6198DA\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "09daf04e-7e2d-4fcd-a9bb-e4d436f35f75",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/0b3182a300b3182a30d40214494d0d19c8da54117b2f?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3a2574c4-c298-4112-8b09-6f0d283ec18b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "9d2c79fc-001e-0066-1e3c-418591000000",
-      "x-ms-client-request-id" : "3a2574c4-c298-4112-8b09-6f0d283ec18b",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D9171687026D4C",
+      "x-ms-request-id" : "2290b573-d01e-0037-71ff-48086e000000",
+      "x-ms-client-request-id" : "55592567-5eb4-47ae-ae44-9c77ee563e1a"
     },
     "Exception" : null
   } ],
-  "variables" : [ "0b3182a300b3182a30d40214494d0d19c8da54117b2f", "0b3182a310b3182a30d4630313dbd41e1e84c4628bb5" ]
+  "variables" : [ "0b3182a300b3182a3ece024749c2e43c96a39484d8d9", "0b3182a310b3182a3ece75707a139a7db339146f995f" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[2].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[2].json
index d923eaf37b06..bce9ce7bfec8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[2].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[2].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/201cd1600201cd160068480665335243c0fe14dd3863?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/201cd1600201cd1606fd80739d5738eddab894ba7ad7?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4cd983c3-9002-48c2-a1d0-db76d3b772df"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2ee70b0b-acfa-4dc1-9d88-88ba5910307b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A61835A",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "eTag" : "0x8D9171686A69B28",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f2c2d823-a01e-001d-103c-41c70d000000",
-      "x-ms-client-request-id" : "4cd983c3-9002-48c2-a1d0-db76d3b772df",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "a6496249-101e-0065-77ff-487486000000",
+      "x-ms-client-request-id" : "2ee70b0b-acfa-4dc1-9d88-88ba5910307b",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/201cd1600201cd160068480665335243c0fe14dd3863/201cd1601201cd16006828448a060be185bb44aa1a4b",
+    "Uri" : "https://REDACTED.blob.core.windows.net/201cd1600201cd1606fd80739d5738eddab894ba7ad7/201cd1601201cd1606fd89352176e6e2cf04e411cb84",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "075ae65f-23df-422b-adca-2c274ec129fa",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "316fe20c-2700-49b1-9e57-f71e8db3384c",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3109602Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A6CF0DF",
-      "x-ms-request-id" : "8783d520-c01e-0079-573c-413695000000",
-      "x-ms-client-request-id" : "075ae65f-23df-422b-adca-2c274ec129fa"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=201cd160",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "35edde05-bf3f-45f0-b512-8bfaf7ebf62a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "07eb620a-501e-0019-683c-414a0a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>201cd160</Prefix><Containers><Container><Name>201cd1600201cd160068480665335243c0fe14dd3863</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:52 GMT</Last-Modified><Etag>\"0x8D90F538A61835A\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "35edde05-bf3f-45f0-b512-8bfaf7ebf62a",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/201cd1600201cd160068480665335243c0fe14dd3863?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1d2e10be-18d9-4b85-82cf-babcc0c083b5"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e229e3e8-d01e-0017-6b3c-4163ba000000",
-      "x-ms-client-request-id" : "1d2e10be-18d9-4b85-82cf-babcc0c083b5",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D91716871BC648",
+      "x-ms-request-id" : "8fc4588c-e01e-0013-49ff-48fece000000",
+      "x-ms-client-request-id" : "316fe20c-2700-49b1-9e57-f71e8db3384c"
     },
     "Exception" : null
   } ],
-  "variables" : [ "201cd1600201cd160068480665335243c0fe14dd3863", "201cd1601201cd16006828448a060be185bb44aa1a4b" ]
+  "variables" : [ "201cd1600201cd1606fd80739d5738eddab894ba7ad7", "201cd1601201cd1606fd89352176e6e2cf04e411cb84" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[3].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[3].json
index 00a15d7fb6e1..879977b4ace8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[3].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[3].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3907e02103907e021c9638854bd6712d3b9f44afc8c3?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3907e02103907e0212d30168976f4987c4215436b976?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c1d3195d-c9ee-4ef5-ada0-d986cea113da"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4b1faca7-518d-4b2e-8475-50b7fe02aa2e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538A8ECA52",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171686A92B0E",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f24fba17-701e-000e-413c-41e301000000",
-      "x-ms-client-request-id" : "c1d3195d-c9ee-4ef5-ada0-d986cea113da",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "5de81f8d-a01e-003d-14ff-48acd9000000",
+      "x-ms-client-request-id" : "4b1faca7-518d-4b2e-8475-50b7fe02aa2e",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3907e02103907e021c9638854bd6712d3b9f44afc8c3/3907e02113907e021c9678833e2ec64b18b4d468f930",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3907e02103907e0212d30168976f4987c4215436b976/3907e02113907e0212d3912037d7e410fe4fe4ec9895",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4bdd0281-2cd1-41f4-8f6b-aff1f2a70cad",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5251c736-7563-4906-992e-f27d1bfdb404",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.5371199Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538A9A71B3",
-      "x-ms-request-id" : "098b7381-b01e-0001-0c3c-41956d000000",
-      "x-ms-client-request-id" : "4bdd0281-2cd1-41f4-8f6b-aff1f2a70cad"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=3907e021",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cd7b4df8-33b8-4559-9788-3ed4822fa11c"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "07eb6257-501e-0019-2d3c-414a0a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>3907e021</Prefix><Containers><Container><Name>3907e02103907e021c9638854bd6712d3b9f44afc8c3</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538A8ECA52\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "cd7b4df8-33b8-4559-9788-3ed4822fa11c",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3907e02103907e021c9638854bd6712d3b9f44afc8c3?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "20662583-d79a-4a2d-8643-d114211d5470"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "c79885db-901e-0064-3c3c-413b29000000",
-      "x-ms-client-request-id" : "20662583-d79a-4a2d-8643-d114211d5470",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "eTag" : "0x8D91716873E6FBF",
+      "x-ms-request-id" : "2290b5fd-d01e-0037-71ff-48086e000000",
+      "x-ms-client-request-id" : "5251c736-7563-4906-992e-f27d1bfdb404"
     },
     "Exception" : null
   } ],
-  "variables" : [ "3907e02103907e021c9638854bd6712d3b9f44afc8c3", "3907e02113907e021c9678833e2ec64b18b4d468f930" ]
+  "variables" : [ "3907e02103907e0212d30168976f4987c4215436b976", "3907e02113907e0212d3912037d7e410fe4fe4ec9895" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[4].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[4].json
index d0d2faf2eddf..fae900293001 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[4].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[4].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/764676e60764676e612751313d36c64fe5b6d458dbcc?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/764676e60764676e621a4848857823d0bfa7e42bf81d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "14fe2773-f157-42dd-bca4-d7e7d0d56d67"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "11059160-4939-435b-a42f-327a71ce7162"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538AAB7950",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171686A6429E",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "189c1c28-601e-0060-3d3c-41b62e000000",
-      "x-ms-client-request-id" : "14fe2773-f157-42dd-bca4-d7e7d0d56d67",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "53e98d8d-f01e-0099-49ff-48a57f000000",
+      "x-ms-client-request-id" : "11059160-4939-435b-a42f-327a71ce7162",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/764676e60764676e612751313d36c64fe5b6d458dbcc/764676e61764676e61273475448ebb82d9d2a4c5a95f",
+    "Uri" : "https://REDACTED.blob.core.windows.net/764676e60764676e621a4848857823d0bfa7e42bf81d/764676e61764676e621a03798c21fab837b884fae89c",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "dafcb73b-3c3f-4520-b809-508e835bed08",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a4d65c69-d297-46ee-840a-7aecfdcd1756",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4840829Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538AB7EA15",
-      "x-ms-request-id" : "9d2c7ab6-001e-0066-403c-418591000000",
-      "x-ms-client-request-id" : "dafcb73b-3c3f-4520-b809-508e835bed08"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=764676e6",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bc8b789c-f9b7-4137-8384-2a88ab06b586"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "27727962-401e-0048-5b3c-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>764676e6</Prefix><Containers><Container><Name>764676e60764676e612751313d36c64fe5b6d458dbcc</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538AAB7950\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "bc8b789c-f9b7-4137-8384-2a88ab06b586",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/764676e60764676e612751313d36c64fe5b6d458dbcc?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6f71e121-0312-41a5-be1c-0afa964704b4"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "9e561bd9-901e-0039-103c-4131ad000000",
-      "x-ms-client-request-id" : "6f71e121-0312-41a5-be1c-0afa964704b4",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "eTag" : "0x8D91716873657FD",
+      "x-ms-request-id" : "48752fad-701e-0011-3dff-484076000000",
+      "x-ms-client-request-id" : "a4d65c69-d297-46ee-840a-7aecfdcd1756"
     },
     "Exception" : null
   } ],
-  "variables" : [ "764676e60764676e612751313d36c64fe5b6d458dbcc", "764676e61764676e61273475448ebb82d9d2a4c5a95f" ]
+  "variables" : [ "764676e60764676e621a4848857823d0bfa7e42bf81d", "764676e61764676e621a03798c21fab837b884fae89c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[5].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[5].json
index ee24bb65700f..b5a14cbaf13d 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[5].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[5].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6f5d47a706f5d47a75c1866792639e391693c4d97add?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6f5d47a706f5d47a7c4d99605b9d97494290a4725b0b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9bbf6c78-3fff-4856-8b52-4096a67ac16f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7c428762-dd82-4a4f-aa61-3a3a8bdbded9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538AB81104",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171686A676FF",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "d1058c8e-a01e-0022-3b3c-410fae000000",
-      "x-ms-client-request-id" : "9bbf6c78-3fff-4856-8b52-4096a67ac16f",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "97c09a92-c01e-0014-15ff-4892ad000000",
+      "x-ms-client-request-id" : "7c428762-dd82-4a4f-aa61-3a3a8bdbded9",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6f5d47a706f5d47a75c1866792639e391693c4d97add/6f5d47a716f5d47a75c104611723ba37871b643ee8e9",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6f5d47a706f5d47a7c4d99605b9d97494290a4725b0b/6f5d47a716f5d47a7c4d42326e281df6b95e54c08a9d",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "53a1c7f2-9b1f-4328-8a6b-5a643b8195da",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c54619eb-6535-4ae5-bb16-2a6a250a3f19",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3690014Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538AC58116",
-      "x-ms-request-id" : "a7b4c126-401e-0067-193c-41da4d000000",
-      "x-ms-client-request-id" : "53a1c7f2-9b1f-4328-8a6b-5a643b8195da"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=6f5d47a7",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c690d9b8-5411-4b45-9dae-90a589fcb93c"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "93bd0a96-f01e-002f-343c-41c77a000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>6f5d47a7</Prefix><Containers><Container><Name>6f5d47a706f5d47a75c1866792639e391693c4d97add</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538AB81104\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c690d9b8-5411-4b45-9dae-90a589fcb93c",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6f5d47a706f5d47a75c1866792639e391693c4d97add?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d29e5d46-3574-4264-a126-3ebf915afd5b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "256c304b-301e-0052-6d3c-41b659000000",
-      "x-ms-client-request-id" : "d29e5d46-3574-4264-a126-3ebf915afd5b",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D917168724C89E",
+      "x-ms-request-id" : "6b1506ae-f01e-0089-56ff-486017000000",
+      "x-ms-client-request-id" : "c54619eb-6535-4ae5-bb16-2a6a250a3f19"
     },
     "Exception" : null
   } ],
-  "variables" : [ "6f5d47a706f5d47a75c1866792639e391693c4d97add", "6f5d47a716f5d47a75c104611723ba37871b643ee8e9" ]
+  "variables" : [ "6f5d47a706f5d47a7c4d99605b9d97494290a4725b0b", "6f5d47a716f5d47a7c4d42326e281df6b95e54c08a9d" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[6].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[6].json
index 37c58eee7984..37c495e15f0d 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[6].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[6].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/44701464044701464ff469871947d98f284b945f8aa4?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/44701464044701464629426710832621345874cf2997?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9c655e29-ac1d-4177-9dd8-9b034e403e3c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "738c691c-3b57-4898-a06b-ffb316869cca"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538ABD0E67",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687B1561E",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "408f0486-601e-0002-463c-417409000000",
-      "x-ms-client-request-id" : "9c655e29-ac1d-4177-9dd8-9b034e403e3c",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "acc12588-e01e-0095-6dff-483277000000",
+      "x-ms-client-request-id" : "738c691c-3b57-4898-a06b-ffb316869cca",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/44701464044701464ff469871947d98f284b945f8aa4/44701464144701464ff4292225044461b8d7b4402b10",
+    "Uri" : "https://REDACTED.blob.core.windows.net/44701464044701464629426710832621345874cf2997/4470146414470146462933696533c97694e594b66ad5",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ee481429-b9c5-42b7-ba01-827712f4e4c8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1e7f583e-bd5c-4181-b7ca-d7017946ba52",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.5598469Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538AC88EE3",
-      "x-ms-request-id" : "7076f4ac-b01e-002e-383c-4198a6000000",
-      "x-ms-client-request-id" : "ee481429-b9c5-42b7-ba01-827712f4e4c8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=44701464",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9c4e71be-15e0-453d-9924-c06ef6feaa30"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "27727986-401e-0048-763c-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>44701464</Prefix><Containers><Container><Name>44701464044701464ff469871947d98f284b945f8aa4</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538ABD0E67\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9c4e71be-15e0-453d-9924-c06ef6feaa30",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/44701464044701464ff469871947d98f284b945f8aa4?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "077f5d63-f004-4a7a-892e-dc986cecc65f"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "12d6dc0b-201e-004e-3b3c-41e439000000",
-      "x-ms-client-request-id" : "077f5d63-f004-4a7a-892e-dc986cecc65f",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687DA7E05",
+      "x-ms-request-id" : "acc125d4-e01e-0095-32ff-483277000000",
+      "x-ms-client-request-id" : "1e7f583e-bd5c-4181-b7ca-d7017946ba52"
     },
     "Exception" : null
   } ],
-  "variables" : [ "44701464044701464ff469871947d98f284b945f8aa4", "44701464144701464ff4292225044461b8d7b4402b10" ]
+  "variables" : [ "44701464044701464629426710832621345874cf2997", "4470146414470146462933696533c97694e594b66ad5" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[7].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[7].json
index 633853d54c7b..11ffc6b23611 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[7].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[7].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/5d6b252505d6b2525a70989337f22e91d3c594caea6d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5d6b252505d6b2525703593444bfb00dec7b542c5805?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9ec5ca8b-cf4a-4253-80f2-5a5ab5578289"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "880e38af-2141-437d-9e04-6e243340d77f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538ABD8F98",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "eTag" : "0x8D9171687C36EE5",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6c1f3aaa-801e-0078-023c-416949000000",
-      "x-ms-client-request-id" : "9ec5ca8b-cf4a-4253-80f2-5a5ab5578289",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT"
+      "x-ms-request-id" : "6b1507ab-f01e-0089-26ff-486017000000",
+      "x-ms-client-request-id" : "880e38af-2141-437d-9e04-6e243340d77f",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/5d6b252505d6b2525a70989337f22e91d3c594caea6d/5d6b252515d6b2525a7004093d9999d7b21884b6bb7c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5d6b252505d6b2525703593444bfb00dec7b542c5805/5d6b252515d6b25257030589012252219ca95445fb04",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "361a5f60-1682-4451-94e9-2df55ee231a7",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e70957b7-8db1-4394-b0ba-a9c604cedc0d",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6238924Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:53 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538AC9EEB9",
-      "x-ms-request-id" : "12d6dba4-201e-004e-5e3c-41e439000000",
-      "x-ms-client-request-id" : "361a5f60-1682-4451-94e9-2df55ee231a7"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=5d6b2525",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "490de1f6-bfe3-4d31-a999-a0e8969b2195"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "b8321a26-201e-002c-093c-41261e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>5d6b2525</Prefix><Containers><Container><Name>5d6b252505d6b2525a70989337f22e91d3c594caea6d</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:53 GMT</Last-Modified><Etag>\"0x8D90F538ABD8F98\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "490de1f6-bfe3-4d31-a999-a0e8969b2195",
-      "Date" : "Tue, 04 May 2021 23:22:52 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/5d6b252505d6b2525a70989337f22e91d3c594caea6d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4703f4e6-3d28-4c05-9a87-9616cb8b5275"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "55bbaa52-f01e-0010-023c-410fd9000000",
-      "x-ms-client-request-id" : "4703f4e6-3d28-4c05-9a87-9616cb8b5275",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687E443CC",
+      "x-ms-request-id" : "487530f8-701e-0011-4aff-484076000000",
+      "x-ms-client-request-id" : "e70957b7-8db1-4394-b0ba-a9c604cedc0d"
     },
     "Exception" : null
   } ],
-  "variables" : [ "5d6b252505d6b2525a70989337f22e91d3c594caea6d", "5d6b252515d6b2525a7004093d9999d7b21884b6bb7c" ]
+  "variables" : [ "5d6b252505d6b2525703593444bfb00dec7b542c5805", "5d6b252515d6b25257030589012252219ca95445fb04" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[8].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[8].json
index 83699c264c05..24ab9ed63e71 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[8].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[8].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/daf339ea0daf339ea5db68014e018dbcdb9ab46dbbf2?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/daf339ea0daf339eaacc754607b234d87f07e41a491e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ff3e548c-e12f-4bc9-85eb-0bdac86289af"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f3b23ed3-b4d9-4add-9f1d-9b2d5b94dc55"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538BF9E62D",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "eTag" : "0x8D9171687C3EA09",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "3ba86f93-d01e-005a-7a3c-41ac56000000",
-      "x-ms-client-request-id" : "ff3e548c-e12f-4bc9-85eb-0bdac86289af",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "x-ms-request-id" : "8fc45a5b-e01e-0013-69ff-48fece000000",
+      "x-ms-client-request-id" : "f3b23ed3-b4d9-4add-9f1d-9b2d5b94dc55",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/daf339ea0daf339ea5db68014e018dbcdb9ab46dbbf2/daf339ea1daf339ea5db36349e5f4ce95a4fb4e10855",
+    "Uri" : "https://REDACTED.blob.core.windows.net/daf339ea0daf339eaacc754607b234d87f07e41a491e/daf339ea1daf339eaacc5756958f64d134d504ab88e6",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "94498028-8e95-4a16-bc5c-bde72c2a5126",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a38b3887-9eed-44b4-a355-da693619d8d8",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6469094Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538C05B4DC",
-      "x-ms-request-id" : "ed7572e7-f01e-0072-1d3c-41cdfe000000",
-      "x-ms-client-request-id" : "94498028-8e95-4a16-bc5c-bde72c2a5126"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=daf339ea",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "af6d7fd6-fc2a-41d3-861b-63c1b7bc8249"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "a7b4c4ed-401e-0067-4a3c-41da4d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>daf339ea</Prefix><Containers><Container><Name>daf339ea0daf339ea5db68014e018dbcdb9ab46dbbf2</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:55 GMT</Last-Modified><Etag>\"0x8D90F538BF9E62D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "af6d7fd6-fc2a-41d3-861b-63c1b7bc8249",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/daf339ea0daf339ea5db68014e018dbcdb9ab46dbbf2?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e4bb140f-ab70-4c23-a3c8-56c766cf5ceb"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "9d2c7f6c-001e-0066-493c-418591000000",
-      "x-ms-client-request-id" : "e4bb140f-ab70-4c23-a3c8-56c766cf5ceb",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687E79FC8",
+      "x-ms-request-id" : "8fc45aeb-e01e-0013-6cff-48fece000000",
+      "x-ms-client-request-id" : "a38b3887-9eed-44b4-a355-da693619d8d8"
     },
     "Exception" : null
   } ],
-  "variables" : [ "daf339ea0daf339ea5db68014e018dbcdb9ab46dbbf2", "daf339ea1daf339ea5db36349e5f4ce95a4fb4e10855" ]
+  "variables" : [ "daf339ea0daf339eaacc754607b234d87f07e41a491e", "daf339ea1daf339eaacc5756958f64d134d504ab88e6" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[9].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[9].json
index fa94b3178572..a4c6646ce7b7 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[9].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasImplUtilStringToSign[9].json
@@ -1,90 +1,51 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c3e808ab0c3e808abd44272028ee16ad47bbc495e8f6?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c3e808ab0c3e808abf511600597aeba4b86d047b694c?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fa0375b6-b643-47d8-a420-fa48b4245cc5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a3202eda-29bf-4ed6-b774-5468fc692285"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90F538BFAE4A1",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "eTag" : "0x8D9171687CD88B6",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "bd7361a7-501e-0026-493c-4182a9000000",
-      "x-ms-client-request-id" : "fa0375b6-b643-47d8-a420-fa48b4245cc5",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT"
+      "x-ms-request-id" : "8fc45a85-e01e-0013-0dff-48fece000000",
+      "x-ms-client-request-id" : "a3202eda-29bf-4ed6-b774-5468fc692285",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c3e808ab0c3e808abd44272028ee16ad47bbc495e8f6/c3e808ab1c3e808abd449581855274d2667294c58bfe",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c3e808ab0c3e808abf511600597aeba4b86d047b694c/c3e808ab1c3e808abf5196372ebb256446d8644a8ad5",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c67f36cd-8dc1-4196-987c-bf9f83382cf1",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e7dfdbe5-196e-4c11-8817-9cd9ebe43549",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Tue, 04 May 2021 23:22:55 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:18 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:18.6939422Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90F538C065138",
-      "x-ms-request-id" : "160bdb4a-d01e-004a-743c-41693e000000",
-      "x-ms-client-request-id" : "c67f36cd-8dc1-4196-987c-bf9f83382cf1"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=c3e808ab",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8dbc3646-fed9-4d24-8cb8-9e2f76f4dd7f"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "9e561ce8-901e-0039-5f3c-4131ad000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>c3e808ab</Prefix><Containers><Container><Name>c3e808ab0c3e808abd44272028ee16ad47bbc495e8f6</Name><Properties><Last-Modified>Tue, 04 May 2021 23:22:55 GMT</Last-Modified><Etag>\"0x8D90F538BFAE4A1\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "8dbc3646-fed9-4d24-8cb8-9e2f76f4dd7f",
-      "Date" : "Tue, 04 May 2021 23:22:54 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/c3e808ab0c3e808abd44272028ee16ad47bbc495e8f6?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "405ada56-8f15-449a-a280-93a66b094086"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "473f4798-801e-001a-183c-41ab6e000000",
-      "x-ms-client-request-id" : "405ada56-8f15-449a-a280-93a66b094086",
-      "Date" : "Tue, 04 May 2021 23:22:55 GMT"
+      "eTag" : "0x8D9171687EEF41E",
+      "x-ms-request-id" : "48753112-701e-0011-64ff-484076000000",
+      "x-ms-client-request-id" : "e7dfdbe5-196e-4c11-8817-9cd9ebe43549"
     },
     "Exception" : null
   } ],
-  "variables" : [ "c3e808ab0c3e808abd44272028ee16ad47bbc495e8f6", "c3e808ab1c3e808abd449581855274d2667294c58bfe" ]
+  "variables" : [ "c3e808ab0c3e808abf511600597aeba4b86d047b694c", "c3e808ab1c3e808abf5196372ebb256446d8644a8ad5" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasReadPermissions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasReadPermissions.json
index 43d846b32c9f..82b6c3f05b87 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasReadPermissions.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasReadPermissions.json
@@ -1,161 +1,126 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda4617643589d744b5cd84feb97a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d5e59de0-356d-4921-b43b-4b0abe180000"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "377b3974-9d2c-4b16-b430-16c33432a967"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4AF243EA",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:38 GMT",
+      "eTag" : "0x8D9171686A92B78",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6308af8-c01e-001b-3ed7-41f4b2000000",
-      "x-ms-client-request-id" : "d5e59de0-356d-4921-b43b-4b0abe180000",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
+      "x-ms-request-id" : "acc12338-e01e-0095-79ff-483277000000",
+      "x-ms-client-request-id" : "377b3974-9d2c-4b16-b430-16c33432a967",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7/634e13ed1634e13eda3f911513c588713aa1b4fe28e4",
+    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda4617643589d744b5cd84feb97a/634e13ed1634e13eda4696008f3b2676e0b2b45f6807",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8be9befe-71c6-4b8f-b71f-ab99a52ddb41",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bff4428d-002a-4e70-8656-a4180a5407bb",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:38 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4160341Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE4B04F1F2",
-      "x-ms-request-id" : "e6308b2b-c01e-001b-66d7-41f4b2000000",
-      "x-ms-client-request-id" : "8be9befe-71c6-4b8f-b71f-ab99a52ddb41"
+      "eTag" : "0x8D91716872BF5D5",
+      "x-ms-request-id" : "5de82037-a01e-003d-1fff-48acd9000000",
+      "x-ms-client-request-id" : "bff4428d-002a-4e70-8656-a4180a5407bb"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7/634e13ed1634e13eda3f911513c588713aa1b4fe28e4?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A38Z&se=2021-05-06T17%3A50%3A38Z&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda4617643589d744b5cd84feb97a/634e13ed1634e13eda4696008f3b2676e0b2b45f6807?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "05ac4c2e-3d14-4549-b756-851dd3ebea77"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d879c89f-2ce5-4200-a322-77994607b7f1"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:38 GMT",
-      "x-ms-version" : "2020-08-04",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:38 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4160341Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:38 GMT",
-      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716872BF5D5",
+      "Content-Length" : "7",
+      "x-ms-request-id" : "02574fdf-b01e-0088-2aff-483fcb000000",
+      "Body" : "default",
+      "Content-Type" : "type",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
+      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:38 GMT",
-      "eTag" : "0x8D90FEE4B04F1F2",
-      "Content-Length" : "7",
-      "x-ms-request-id" : "e6308b4b-c01e-001b-01d7-41f4b2000000",
-      "Body" : "default",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "05ac4c2e-3d14-4549-b756-851dd3ebea77",
-      "Content-Type" : "type"
+      "x-ms-client-request-id" : "d879c89f-2ce5-4200-a322-77994607b7f1"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7/634e13ed1634e13eda3f911513c588713aa1b4fe28e4?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A38Z&se=2021-05-06T17%3A50%3A38Z&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda4617643589d744b5cd84feb97a/634e13ed1634e13eda4696008f3b2676e0b2b45f6807?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b4cf5c24-cd22-4f12-bca8-fd499d6596fe"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "266eae11-a1e6-47b7-9e12-52b82b0180e0"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:38 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4160341Z",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-blob-type" : "BlockBlob",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
       "Content-Encoding" : "encoding",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:38 GMT",
-      "eTag" : "0x8D90FEE4B04F1F2",
-      "x-ms-request-id" : "e6308b61-c01e-001b-14d7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716872BF5D5",
+      "x-ms-request-id" : "acc12572-e01e-0095-5aff-483277000000",
       "Content-Type" : "type",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:38 GMT",
-      "x-ms-version" : "2020-08-04",
-      "Date" : "Wed, 05 May 2021 17:50:38 GMT",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "b4cf5c24-cd22-4f12-bca8-fd499d6596fe"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=634e13ed",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4a593f3f-167f-40bc-8583-0b7cc4f8926a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6308b85-c01e-001b-30d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>634e13ed</Prefix><Containers><Container><Name>634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:38 GMT</Last-Modified><Etag>\"0x8D90FEE4AF243EA\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4a593f3f-167f-40bc-8583-0b7cc4f8926a",
-      "Date" : "Wed, 05 May 2021 17:50:38 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "aec9bdfb-e251-4663-bf35-d8686c7e2c61"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e6308b98-c01e-001b-40d7-41f4b2000000",
-      "x-ms-client-request-id" : "aec9bdfb-e251-4663-bf35-d8686c7e2c61",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT"
+      "x-ms-client-request-id" : "266eae11-a1e6-47b7-9e12-52b82b0180e0"
     },
     "Exception" : null
   } ],
-  "variables" : [ "634e13ed0634e13eda3f65764b44f3d20aa5f431a8d7", "634e13ed1634e13eda3f911513c588713aa1b4fe28e4", "2021-05-05T17:50:38.689458900Z", "2021-05-05T17:50:38.689458900Z" ]
+  "variables" : [ "634e13ed0634e13eda4617643589d744b5cd84feb97a", "634e13ed1634e13eda4696008f3b2676e0b2b45f6807", "2021-05-14T20:26:17.526688Z", "2021-05-14T20:26:17.527685500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshot.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshot.json
index 5c67c4bfc5ad..e91a12afa03b 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshot.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshot.json
@@ -1,80 +1,82 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ea6312e2-26a1-4a15-9571-af0df02fa7e8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "eb1ef211-1621-4255-ae13-f9ff355ffbe3"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4E8587B1",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:44 GMT",
+      "eTag" : "0x8D9171686A2C6A4",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630958b-c01e-001b-61d7-41f4b2000000",
-      "x-ms-client-request-id" : "ea6312e2-26a1-4a15-9571-af0df02fa7e8",
-      "Date" : "Wed, 05 May 2021 17:50:43 GMT"
+      "x-ms-request-id" : "7d83c3c8-701e-003e-7aff-484dbd000000",
+      "x-ms-client-request-id" : "eb1ef211-1621-4255-ae13-f9ff355ffbe3",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c/3a6fb34913a6fb3490d2771701d34e662272b43039dd",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d/3a6fb34913a6fb3499741273212f5c47a0c794567bbd",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f40002e0-4aa8-418c-b4d6-5bc1efa7ebb5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e775e2a7-9dcd-40da-bc2b-f2b172430eed",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4830820Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:43 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE4E9157DA",
-      "x-ms-request-id" : "e63095c5-c01e-001b-16d7-41f4b2000000",
-      "x-ms-client-request-id" : "f40002e0-4aa8-418c-b4d6-5bc1efa7ebb5"
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "8fc458c5-e01e-0013-7aff-48fece000000",
+      "x-ms-client-request-id" : "e775e2a7-9dcd-40da-bc2b-f2b172430eed"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c/3a6fb34913a6fb3490d2771701d34e662272b43039dd?comp=snapshot",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d/3a6fb34913a6fb3499741273212f5c47a0c794567bbd?comp=snapshot",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1fe6de99-64a7-40a6-8082-48d848cda366"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "65d9ccca-6a05-4d81-ba28-c574efc403eb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-snapshot" : "2021-05-05T17:50:44.5387684Z",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4E9157DA",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.8653512Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e63095f7-c01e-001b-43d7-41f4b2000000",
       "x-ms-request-server-encrypted" : "false",
-      "x-ms-client-request-id" : "1fe6de99-64a7-40a6-8082-48d848cda366",
-      "Date" : "Wed, 05 May 2021 17:50:43 GMT"
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-snapshot" : "2021-05-14T20:26:17.8643512Z",
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "acc124d7-e01e-0095-55ff-483277000000",
+      "x-ms-client-request-id" : "65d9ccca-6a05-4d81-ba28-c574efc403eb"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c/3a6fb34913a6fb3490d2771701d34e662272b43039dd?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A44Z&se=2021-05-06T17%3A50%3A44Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d/3a6fb34913a6fb3499741273212f5c47a0c794567bbd?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "067aafd3-51bb-44f2-ba49-8e9516941c3c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ca1d1d74-e1ca-4e35-9f0a-2f5e4af4beff"
     },
     "Response" : {
       "content-length" : "447",
@@ -82,60 +84,60 @@
       "x-ms-error-code" : "AuthenticationFailed",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630963a-c01e-001b-04d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:e630963a-c01e-001b-04d7-41f4b2000000\nTime:2021-05-05T17:50:44.6534878Z</Message><AuthenticationErrorDetail>The specified signed resource is not allowed for the this resource level</AuthenticationErrorDetail></Error>",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "x-ms-request-id" : "a1f88649-e01e-005e-61ff-483122000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:a1f88649-e01e-005e-61ff-483122000000\nTime:2021-05-14T20:26:18.2798082Z</Message><AuthenticationErrorDetail>The specified signed resource is not allowed for the this resource level</AuthenticationErrorDetail></Error>",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c/3a6fb34913a6fb3490d2771701d34e662272b43039dd?snapshot=2021-05-05T17%3A50%3A44.5387684Z&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A44Z&se=2021-05-06T17%3A50%3A44Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d/3a6fb34913a6fb3499741273212f5c47a0c794567bbd?snapshot=2021-05-14T20%3A26%3A17.8643512Z&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3c5d1d94-8bbf-439e-854f-38be5b37c03c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fd194d75-7ff5-4fe2-ab8a-2362ed5e57de"
     },
     "Response" : {
       "content-length" : "7",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:44 GMT",
-      "eTag" : "0x8D90FEE4E9157DA",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716873609CB",
       "Content-Length" : "7",
-      "x-ms-request-id" : "e630966e-c01e-001b-35d7-41f4b2000000",
+      "x-ms-request-id" : "8fc45aaf-e01e-0013-35ff-48fece000000",
       "Body" : "default",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "3c5d1d94-8bbf-439e-854f-38be5b37c03c",
+      "x-ms-client-request-id" : "fd194d75-7ff5-4fe2-ab8a-2362ed5e57de",
       "Content-Type" : "type"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c/3a6fb34913a6fb3490d2771701d34e662272b43039dd?snapshot=2021-05-05T17%3A50%3A44.5387684Z&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A44Z&se=2021-05-06T17%3A50%3A44Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d/3a6fb34913a6fb3499741273212f5c47a0c794567bbd?snapshot=2021-05-14T20%3A26%3A17.8643512Z&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2c42f4a2-dc6e-4ce7-ac6d-79ff79695f0a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "145a8fa6-3e21-4b05-b355-48486e232f85"
     },
     "Response" : {
       "content-length" : "7",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
@@ -145,54 +147,14 @@
       "x-ms-access-tier" : "Hot",
       "Content-Disposition" : "disposition",
       "Content-Encoding" : "encoding",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:44 GMT",
-      "eTag" : "0x8D90FEE4E9157DA",
-      "x-ms-request-id" : "e630969a-c01e-001b-5ad7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "a1f886e6-e01e-005e-67ff-483122000000",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "2c42f4a2-dc6e-4ce7-ac6d-79ff79695f0a",
+      "x-ms-client-request-id" : "145a8fa6-3e21-4b05-b355-48486e232f85",
       "Content-Type" : "type"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=3a6fb349",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3213f829-31a2-4d64-ba79-7100fca8b47e"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e63096c2-c01e-001b-80d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>3a6fb349</Prefix><Containers><Container><Name>3a6fb34903a6fb3490d258544dff3d1a3e924425287c</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:44 GMT</Last-Modified><Etag>\"0x8D90FEE4E8587B1\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3213f829-31a2-4d64-ba79-7100fca8b47e",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/3a6fb34903a6fb3490d258544dff3d1a3e924425287c?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fa294491-205f-4c6a-8462-ca878739f6cf"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e63096e2-c01e-001b-1ed7-41f4b2000000",
-      "x-ms-client-request-id" : "fa294491-205f-4c6a-8462-ca878739f6cf",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "3a6fb34903a6fb3490d258544dff3d1a3e924425287c", "3a6fb34913a6fb3490d2771701d34e662272b43039dd", "2021-05-05T17:50:44.748355300Z", "2021-05-05T17:50:44.748355300Z" ]
+  "variables" : [ "3a6fb34903a6fb34997412588c23f512d5f4d4ba1a1d", "3a6fb34913a6fb3499741273212f5c47a0c794567bbd", "2021-05-14T20:26:17.974688500Z", "2021-05-14T20:26:17.974688500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshotUserDelegation.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshotUserDelegation.json
index 308181720203..a605e87ef0c4 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshotUserDelegation.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasSnapshotUserDelegation.json
@@ -1,102 +1,104 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3d58149b-a9cb-4e6a-84c3-62a2f75c8bde"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6cad061a-d2cd-461d-908b-bc28b5e1901d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4EEEBD1B",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:45 GMT",
+      "eTag" : "0x8D9171686A2BEAC",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6309709-c01e-001b-40d7-41f4b2000000",
-      "x-ms-client-request-id" : "3d58149b-a9cb-4e6a-84c3-62a2f75c8bde",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT"
+      "x-ms-request-id" : "8f2b7611-101e-0038-0aff-487e02000000",
+      "x-ms-client-request-id" : "6cad061a-d2cd-461d-908b-bc28b5e1901d",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd/835f583a1835f583aad062497206788e1709a4572b8f",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe/835f583a1835f583acd4879716043b6f075b845f5918",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "91d7b866-9bf3-4559-a0e6-10c7e1a7812a",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d5baa3cd-67ae-475d-b4ef-fbf66fe3a2c4",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4820811Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE4EFB0278",
-      "x-ms-request-id" : "e6309743-c01e-001b-73d7-41f4b2000000",
-      "x-ms-client-request-id" : "91d7b866-9bf3-4559-a0e6-10c7e1a7812a"
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "49ad39a7-601e-008b-51ff-48deaf000000",
+      "x-ms-client-request-id" : "d5baa3cd-67ae-475d-b4ef-fbf66fe3a2c4"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd/835f583a1835f583aad062497206788e1709a4572b8f?comp=snapshot",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe/835f583a1835f583acd4879716043b6f075b845f5918?comp=snapshot",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3b5b72b4-33ea-43ee-b758-6661a85c798d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d8b8238f-d2b7-4986-a781-c0fa5159a08f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-snapshot" : "2021-05-05T17:50:45.2262608Z",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4EFB0278",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.9354010Z",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630977b-c01e-001b-20d7-41f4b2000000",
       "x-ms-request-server-encrypted" : "false",
-      "x-ms-client-request-id" : "3b5b72b4-33ea-43ee-b758-6661a85c798d",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT"
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-snapshot" : "2021-05-14T20:26:17.9344010Z",
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "acc124ec-e01e-0095-68ff-483277000000",
+      "x-ms-client-request-id" : "d8b8238f-d2b7-4986-a781-c0fa5159a08f"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a7c91810-44bd-48f7-b152-9d3120008441",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cf705abf-78b6-4a0e-a5fb-6929ad187715",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e63097fc-c01e-001b-14d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>3fb1f1f7-08c2-480e-8adb-6e2fa6494245</SignedOid><SignedTid>3a980d6f-5810-4eed-9f09-77663fda52a2</SignedTid><SignedStart>2021-05-04T17:50:45Z</SignedStart><SignedExpiry>2021-05-06T17:50:45Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "a7c91810-44bd-48f7-b152-9d3120008441",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "x-ms-request-id" : "acc126dc-e01e-0095-15ff-483277000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>40fb840a-a007-4f00-a1b8-9e131e9f6202</SignedOid><SignedTid>1f2b5fab-046d-4d55-b8e6-17379f36faab</SignedTid><SignedStart>2021-05-13T20:26:18Z</SignedStart><SignedExpiry>2021-05-15T20:26:18Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "cf705abf-78b6-4a0e-a5fb-6929ad187715",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd/835f583a1835f583aad062497206788e1709a4572b8f?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A45Z&se=2021-05-06T17%3A50%3A45Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A45Z&ske=2021-05-06T17%3A50%3A45Z&sks=b&skv=2020-08-04&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe/835f583a1835f583acd4879716043b6f075b845f5918?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A18Z&se=2021-05-15T20%3A26%3A18Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A18Z&ske=2021-05-15T20%3A26%3A18Z&sks=b&skv=2020-10-02&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "98d5c049-4b18-4961-94ad-ef2246a15cb8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2812c0ce-5fc0-4e96-9699-ebc414915601"
     },
     "Response" : {
       "content-length" : "447",
@@ -104,60 +106,60 @@
       "x-ms-error-code" : "AuthenticationFailed",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e6309821-c01e-001b-37d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:e6309821-c01e-001b-37d7-41f4b2000000\nTime:2021-05-05T17:50:45.5651388Z</Message><AuthenticationErrorDetail>The specified signed resource is not allowed for the this resource level</AuthenticationErrorDetail></Error>",
-      "Date" : "Wed, 05 May 2021 17:50:44 GMT",
+      "x-ms-request-id" : "acc126fa-e01e-0095-30ff-483277000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:acc126fa-e01e-0095-30ff-483277000000\nTime:2021-05-14T20:26:19.2648268Z</Message><AuthenticationErrorDetail>The specified signed resource is not allowed for the this resource level</AuthenticationErrorDetail></Error>",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd/835f583a1835f583aad062497206788e1709a4572b8f?snapshot=2021-05-05T17%3A50%3A45.2262608Z&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A45Z&se=2021-05-06T17%3A50%3A45Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A45Z&ske=2021-05-06T17%3A50%3A45Z&sks=b&skv=2020-08-04&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe/835f583a1835f583acd4879716043b6f075b845f5918?snapshot=2021-05-14T20%3A26%3A17.9344010Z&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A18Z&se=2021-05-15T20%3A26%3A18Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A18Z&ske=2021-05-15T20%3A26%3A18Z&sks=b&skv=2020-10-02&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "446b7024-6c1b-4a3c-9275-e70ce575e3bb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "42ac91c8-4f68-44dc-b9e1-3092f3f3afd2"
     },
     "Response" : {
       "content-length" : "7",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:19 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:45 GMT",
-      "eTag" : "0x8D90FEE4EFB0278",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716873609CB",
       "Content-Length" : "7",
-      "x-ms-request-id" : "e6309850-c01e-001b-5fd7-41f4b2000000",
+      "x-ms-request-id" : "acc12729-e01e-0095-5eff-483277000000",
       "Body" : "default",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "446b7024-6c1b-4a3c-9275-e70ce575e3bb",
+      "x-ms-client-request-id" : "42ac91c8-4f68-44dc-b9e1-3092f3f3afd2",
       "Content-Type" : "type"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd/835f583a1835f583aad062497206788e1709a4572b8f?snapshot=2021-05-05T17%3A50%3A45.2262608Z&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A45Z&se=2021-05-06T17%3A50%3A45Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A45Z&ske=2021-05-06T17%3A50%3A45Z&sks=b&skv=2020-08-04&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583acd4013366fd552b7955a4e66bfe/835f583a1835f583acd4879716043b6f075b845f5918?snapshot=2021-05-14T20%3A26%3A17.9344010Z&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A18Z&se=2021-05-15T20%3A26%3A18Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A18Z&ske=2021-05-15T20%3A26%3A18Z&sks=b&skv=2020-10-02&sr=bs&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5c9f71e4-5ebe-403e-8fed-797966ee34f7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "19004c9e-abf4-4cbc-8806-ffd712f31d61"
     },
     "Response" : {
       "content-length" : "7",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:45 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:19 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
@@ -167,54 +169,14 @@
       "x-ms-access-tier" : "Hot",
       "Content-Disposition" : "disposition",
       "Content-Encoding" : "encoding",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:45 GMT",
-      "eTag" : "0x8D90FEE4EFB0278",
-      "x-ms-request-id" : "e6309871-c01e-001b-80d7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "acc12802-e01e-0095-14ff-483277000000",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "5c9f71e4-5ebe-403e-8fed-797966ee34f7",
+      "x-ms-client-request-id" : "19004c9e-abf4-4cbc-8806-ffd712f31d61",
       "Content-Type" : "type"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=835f583a",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2686579e-f05e-4a22-b7f4-1291f179a369"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6309895-c01e-001b-1ed7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>835f583a</Prefix><Containers><Container><Name>835f583a0835f583aad05135915b0c7d5ac6d45199fd</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:45 GMT</Last-Modified><Etag>\"0x8D90FEE4EEEBD1B\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2686579e-f05e-4a22-b7f4-1291f179a369",
-      "Date" : "Wed, 05 May 2021 17:50:45 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/835f583a0835f583aad05135915b0c7d5ac6d45199fd?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e9557035-f099-453b-8f97-6d0a34d47f9a"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e63098b4-c01e-001b-3ad7-41f4b2000000",
-      "x-ms-client-request-id" : "e9557035-f099-453b-8f97-6d0a34d47f9a",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "835f583a0835f583aad05135915b0c7d5ac6d45199fd", "835f583a1835f583aad062497206788e1709a4572b8f", "2021-05-05T17:50:45.412343200Z", "2021-05-05T17:50:45.412343200Z", "2021-05-05T17:50:45.413347100Z", "2021-05-05T17:50:45.413347100Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
+  "variables" : [ "835f583a0835f583acd4013366fd552b7955a4e66bfe", "835f583a1835f583acd4879716043b6f075b845f5918", "2021-05-14T20:26:18.040687200Z", "2021-05-14T20:26:18.040687200Z", "2021-05-14T20:26:18.042686400Z", "2021-05-14T20:26:18.042686400Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTags.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTags.json
index fa3c36e3b1bd..bb551397651f 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTags.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTags.json
@@ -1,130 +1,91 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2bdea946-0b85-46ca-910c-2fbfbec3e6a0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0d3424ee-500a-459f-8ff2-c60a785bb041"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE50FA55F4",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:48 GMT",
+      "eTag" : "0x8D9171686A8B1DF",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6309d83-c01e-001b-0ed7-41f4b2000000",
-      "x-ms-client-request-id" : "2bdea946-0b85-46ca-910c-2fbfbec3e6a0",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT"
+      "x-ms-request-id" : "18c67924-001e-0034-08ff-48e90a000000",
+      "x-ms-client-request-id" : "0d3424ee-500a-459f-8ff2-c60a785bb041",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a/ddff4dbd1ddff4dbde9b66196556a1a94ee5d4eec9c2",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4/ddff4dbd1ddff4dbded1002048e7e7c0ffb444313bb4",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "75f1d9a2-5335-4cb1-832e-eacb73ae9e0d",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0debdab2-dc4a-4c75-9280-7393d91b99d1",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:48 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4160341Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE510626D4",
-      "x-ms-request-id" : "e6309dc7-c01e-001b-4dd7-41f4b2000000",
-      "x-ms-client-request-id" : "75f1d9a2-5335-4cb1-832e-eacb73ae9e0d"
+      "eTag" : "0x8D91716872BF5D5",
+      "x-ms-request-id" : "acc12455-e01e-0095-66ff-483277000000",
+      "x-ms-client-request-id" : "0debdab2-dc4a-4c75-9280-7393d91b99d1"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a/ddff4dbd1ddff4dbde9b66196556a1a94ee5d4eec9c2?comp=tags&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A48Z&se=2021-05-06T17%3A50%3A48Z&sr=b&sp=racwdt&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4/ddff4dbd1ddff4dbded1002048e7e7c0ffb444313bb4?comp=tags&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwdt&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "90f54b68-b27d-434f-b663-f213f804b7e7",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "57057885-cb32-4c1f-9ddf-bbf835635a44",
       "Content-Type" : "application/xml"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "e6309e0d-c01e-001b-0dd7-41f4b2000000",
-      "x-ms-client-request-id" : "90f54b68-b27d-434f-b663-f213f804b7e7",
-      "Date" : "Wed, 05 May 2021 17:50:48 GMT"
+      "x-ms-request-id" : "48752ff2-701e-0011-74ff-484076000000",
+      "x-ms-client-request-id" : "57057885-cb32-4c1f-9ddf-bbf835635a44",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a/ddff4dbd1ddff4dbde9b66196556a1a94ee5d4eec9c2?comp=tags&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A48Z&se=2021-05-06T17%3A50%3A48Z&sr=b&sp=racwdt&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4/ddff4dbd1ddff4dbded1002048e7e7c0ffb444313bb4?comp=tags&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwdt&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "57327cf1-f7fe-4224-a7e8-3c19451e6962"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "da51b5ea-bc2b-4c08-9ca2-4b6c1da191dd"
     },
     "Response" : {
       "content-length" : "115",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e6309e4e-c01e-001b-45d7-41f4b2000000",
+      "x-ms-request-id" : "a1f88626-e01e-005e-46ff-483122000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags>",
-      "x-ms-client-request-id" : "57327cf1-f7fe-4224-a7e8-3c19451e6962",
-      "Date" : "Wed, 05 May 2021 17:50:48 GMT",
+      "x-ms-client-request-id" : "da51b5ea-bc2b-4c08-9ca2-4b6c1da191dd",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ddff4dbd",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "07231b0c-94b6-42ef-9db7-317a3b71ca49"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6309e80-c01e-001b-75d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ddff4dbd</Prefix><Containers><Container><Name>ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:48 GMT</Last-Modified><Etag>\"0x8D90FEE50FA55F4\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "07231b0c-94b6-42ef-9db7-317a3b71ca49",
-      "Date" : "Wed, 05 May 2021 17:50:48 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "21c26686-8c58-4d42-b44f-cf13540c327c"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e6309eb0-c01e-001b-23d7-41f4b2000000",
-      "x-ms-client-request-id" : "21c26686-8c58-4d42-b44f-cf13540c327c",
-      "Date" : "Wed, 05 May 2021 17:50:50 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "ddff4dbd0ddff4dbde9b4644257ac9ebb30ee4bec90a", "ddff4dbd1ddff4dbde9b66196556a1a94ee5d4eec9c2", "2021-05-05T17:50:48.749171600Z", "2021-05-05T17:50:48.749171600Z" ]
+  "variables" : [ "ddff4dbd0ddff4dbded16446158925fbbb1ca42e8ad4", "ddff4dbd1ddff4dbded1002048e7e7c0ffb444313bb4", "2021-05-14T20:26:17.526688Z", "2021-05-14T20:26:17.527685500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTagsFail.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTagsFail.json
index 61bee1645c27..8d3212edaf5c 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTagsFail.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasTagsFail.json
@@ -1,113 +1,74 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb81c621875c139ee9e85004cc0acc?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb8b89671881ddcdd76b97748b4a18?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "37d5bf1c-0d7d-469e-980e-737df63dc7cb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bd88661b-4d65-4da1-809b-19d61242ebeb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE52A2D542",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:51 GMT",
+      "eTag" : "0x8D9171686A2F10E",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630a3a1-c01e-001b-53d7-41f4b2000000",
-      "x-ms-client-request-id" : "37d5bf1c-0d7d-469e-980e-737df63dc7cb",
-      "Date" : "Wed, 05 May 2021 17:50:50 GMT"
+      "x-ms-request-id" : "a3227876-a01e-0002-4aff-48647a000000",
+      "x-ms-client-request-id" : "bd88661b-4d65-4da1-809b-19d61242ebeb",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb81c621875c139ee9e85004cc0acc/da095fb81da095fb81c6385054429f523e3814cb8b8b",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb8b89671881ddcdd76b97748b4a18/da095fb81da095fb8b8976426d3a8f2142f544b96899",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ae1d501e-f7ac-4bc5-b0f3-5085d0ac4247",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "708e77a1-d178-46e0-b408-440104ce4728",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:51 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.5211090Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:50 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE52AF1BB3",
-      "x-ms-request-id" : "e630a3c8-c01e-001b-6ed7-41f4b2000000",
-      "x-ms-client-request-id" : "ae1d501e-f7ac-4bc5-b0f3-5085d0ac4247"
+      "eTag" : "0x8D91716873BFE52",
+      "x-ms-request-id" : "02574fba-b01e-0088-09ff-483fcb000000",
+      "x-ms-client-request-id" : "708e77a1-d178-46e0-b408-440104ce4728"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb81c621875c139ee9e85004cc0acc/da095fb81da095fb81c6385054429f523e3814cb8b8b?comp=tags&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A51Z&se=2021-05-06T17%3A50%3A51Z&sr=b&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb8b89671881ddcdd76b97748b4a18/da095fb81da095fb8b8976426d3a8f2142f544b96899?comp=tags&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d69daf8e-5b92-47cc-b60e-566ddbd924d8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e35d3ced-d553-4d75-8b38-e56b0a475386",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "280",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630a3ee-c01e-001b-12d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630a3ee-c01e-001b-12d7-41f4b2000000\nTime:2021-05-05T17:50:51.4383292Z</Message></Error>",
-      "x-ms-client-request-id" : "d69daf8e-5b92-47cc-b60e-566ddbd924d8",
-      "Date" : "Wed, 05 May 2021 17:50:50 GMT",
+      "x-ms-request-id" : "5de82095-a01e-003d-6aff-48acd9000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:5de82095-a01e-003d-6aff-48acd9000000\nTime:2021-05-14T20:26:17.9468574Z</Message></Error>",
+      "x-ms-client-request-id" : "e35d3ced-d553-4d75-8b38-e56b0a475386",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=da095fb8",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c64b1fd9-2afa-479b-8762-f1504a760764"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630a416-c01e-001b-35d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>da095fb8</Prefix><Containers><Container><Name>da095fb80da095fb81c621875c139ee9e85004cc0acc</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:51 GMT</Last-Modified><Etag>\"0x8D90FEE52A2D542\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c64b1fd9-2afa-479b-8762-f1504a760764",
-      "Date" : "Wed, 05 May 2021 17:50:50 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/da095fb80da095fb81c621875c139ee9e85004cc0acc?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1d2d6f38-9cce-4d75-9c0b-225fcfbbd695"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630a444-c01e-001b-5ad7-41f4b2000000",
-      "x-ms-client-request-id" : "1d2d6f38-9cce-4d75-9c0b-225fcfbbd695",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "da095fb80da095fb81c621875c139ee9e85004cc0acc", "da095fb81da095fb81c6385054429f523e3814cb8b8b", "2021-05-05T17:50:51.544136300Z", "2021-05-05T17:50:51.544136300Z" ]
+  "variables" : [ "da095fb80da095fb8b89671881ddcdd76b97748b4a18", "da095fb81da095fb8b8976426d3a8f2142f544b96899", "2021-05-14T20:26:17.644689700Z", "2021-05-14T20:26:17.644689700Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasUserDelegation.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasUserDelegation.json
index fe1d36f75e4e..914790f14c55 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasUserDelegation.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobSasUserDelegation.json
@@ -1,183 +1,148 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bfb4a7232341af163544c94cf5861?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d5abea7d-9896-4552-ad10-2df05c8491fd"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d13111a8-9f2d-45be-9508-0185d0151ada"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4CE3C05D",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "eTag" : "0x8D9171686A62684",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e63090d5-c01e-001b-5ad7-41f4b2000000",
-      "x-ms-client-request-id" : "d5abea7d-9896-4552-ad10-2df05c8491fd",
-      "Date" : "Wed, 05 May 2021 17:50:41 GMT"
+      "x-ms-request-id" : "8ea96d22-901e-008f-75ff-4853a8000000",
+      "x-ms-client-request-id" : "d13111a8-9f2d-45be-9508-0185d0151ada",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb/ba1973bf1ba1973bf7e3719175872976107e24649b37",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bfb4a7232341af163544c94cf5861/ba1973bf1ba1973bfb4a86850e66bba70d71c4b27853",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "da94e579-ab73-4ae2-9b82-b7e61fd44d00",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "85a9bf3f-baf6-48cb-a4ae-2a99c3e59075",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2449124Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:41 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE4CF05369",
-      "x-ms-request-id" : "e63090ee-c01e-001b-70d7-41f4b2000000",
-      "x-ms-client-request-id" : "da94e579-ab73-4ae2-9b82-b7e61fd44d00"
+      "eTag" : "0x8D917168711D964",
+      "x-ms-request-id" : "5de82024-a01e-003d-0eff-48acd9000000",
+      "x-ms-client-request-id" : "85a9bf3f-baf6-48cb-a4ae-2a99c3e59075"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "36d537ef-8f20-466c-95b8-325f74d7955b",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fbb8c350-33a8-46a8-97b4-b8e451cbc70e",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630925a-c01e-001b-2ad7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>16908f8d-436f-48c4-aec6-b429759d3929</SignedOid><SignedTid>405e0fd3-63c3-4a2e-97ad-a2c624facd23</SignedTid><SignedStart>2021-05-04T17:50:41Z</SignedStart><SignedExpiry>2021-05-06T17:50:41Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "36d537ef-8f20-466c-95b8-325f74d7955b",
-      "Date" : "Wed, 05 May 2021 17:50:42 GMT",
+      "x-ms-request-id" : "49ad3e12-601e-008b-6dff-48deaf000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>49a94656-f2d0-4c86-8f16-8c08718d1a0e</SignedOid><SignedTid>1132a647-a1cf-4e25-99c1-d96ea9f05ddf</SignedTid><SignedStart>2021-05-13T20:26:17Z</SignedStart><SignedExpiry>2021-05-15T20:26:17Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "fbb8c350-33a8-46a8-97b4-b8e451cbc70e",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb/ba1973bf1ba1973bf7e3719175872976107e24649b37?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A41Z&se=2021-05-06T17%3A50%3A41Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A41Z&ske=2021-05-06T17%3A50%3A41Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bfb4a7232341af163544c94cf5861/ba1973bf1ba1973bfb4a86850e66bba70d71c4b27853?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A17Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2a67289a-9c87-41b3-bb8c-c7da5a677805"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "02817abe-f7a0-4ad1-951b-361cb5b6d8eb"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:41 GMT",
-      "x-ms-version" : "2020-08-04",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2449124Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:42 GMT",
-      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D917168711D964",
+      "Content-Length" : "7",
+      "x-ms-request-id" : "4875321b-701e-0011-4eff-484076000000",
+      "Body" : "default",
+      "Content-Type" : "type",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
+      "Date" : "Fri, 14 May 2021 20:26:19 GMT",
+      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:41 GMT",
-      "eTag" : "0x8D90FEE4CF05369",
-      "Content-Length" : "7",
-      "x-ms-request-id" : "e6309304-c01e-001b-3cd7-41f4b2000000",
-      "Body" : "default",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "2a67289a-9c87-41b3-bb8c-c7da5a677805",
-      "Content-Type" : "type"
+      "x-ms-client-request-id" : "02817abe-f7a0-4ad1-951b-361cb5b6d8eb"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb/ba1973bf1ba1973bf7e3719175872976107e24649b37?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A50%3A41Z&se=2021-05-06T17%3A50%3A41Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A41Z&ske=2021-05-06T17%3A50%3A41Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bfb4a7232341af163544c94cf5861/ba1973bf1ba1973bfb4a86850e66bba70d71c4b27853?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T20%3A26%3A17Z&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A17Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&sr=b&sp=racwdlme&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0f44bbfe-00dc-4fe8-8990-2d0ec3e22348"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a4114934-93ec-4d4d-870f-9a3a90aeb1d8"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2449124Z",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-blob-type" : "BlockBlob",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
       "Content-Encoding" : "encoding",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:41 GMT",
-      "eTag" : "0x8D90FEE4CF05369",
-      "x-ms-request-id" : "e6309384-c01e-001b-2bd7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D917168711D964",
+      "x-ms-request-id" : "48753265-701e-0011-15ff-484076000000",
       "Content-Type" : "type",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:43 GMT",
-      "x-ms-version" : "2020-08-04",
-      "Date" : "Wed, 05 May 2021 17:50:42 GMT",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:19 GMT",
+      "x-ms-version" : "2020-10-02",
+      "Date" : "Fri, 14 May 2021 20:26:19 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "0f44bbfe-00dc-4fe8-8990-2d0ec3e22348"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ba1973bf",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bcac31bd-e2a0-409b-9295-12e04ce4e7b9"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e63093b8-c01e-001b-56d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ba1973bf</Prefix><Containers><Container><Name>ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:41 GMT</Last-Modified><Etag>\"0x8D90FEE4CE3C05D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "bcac31bd-e2a0-409b-9295-12e04ce4e7b9",
-      "Date" : "Wed, 05 May 2021 17:50:42 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "38f85f9d-bcb0-4e10-b5c6-0a32785a28ab"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e63093d0-c01e-001b-69d7-41f4b2000000",
-      "x-ms-client-request-id" : "38f85f9d-bcb0-4e10-b5c6-0a32785a28ab",
-      "Date" : "Wed, 05 May 2021 17:50:43 GMT"
+      "x-ms-client-request-id" : "a4114934-93ec-4d4d-870f-9a3a90aeb1d8"
     },
     "Exception" : null
   } ],
-  "variables" : [ "ba1973bf0ba1973bf7e353022fbc5a0c7e64b4d61bcb", "ba1973bf1ba1973bf7e3719175872976107e24649b37", "2021-05-05T17:50:41.894399800Z", "2021-05-05T17:50:41.894399800Z", "2021-05-05T17:50:41.959400300Z", "2021-05-05T17:50:41.959400300Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
+  "variables" : [ "ba1973bf0ba1973bfb4a7232341af163544c94cf5861", "ba1973bf1ba1973bfb4a86850e66bba70d71c4b27853", "2021-05-14T20:26:17.368688500Z", "2021-05-14T20:26:17.368688500Z", "2021-05-14T20:26:17.468688600Z", "2021-05-14T20:26:17.468688600Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobUserDelegationSaoid.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobUserDelegationSaoid.json
index 0fffce8174ad..e58ee2d82af8 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobUserDelegationSaoid.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsBlobUserDelegationSaoid.json
@@ -1,144 +1,107 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc892c837378de9db81943b94d1c9e5?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc89cee87096e0fd5a20bda94834af4?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "24783976-8e0e-47a1-b2db-3a30cf0ea24b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bf313102-cbac-4238-ba29-3286c8395769"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE54ADD1DF",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:54 GMT",
+      "eTag" : "0x8D9171686A627AB",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630abcb-c01e-001b-4ed7-41f4b2000000",
-      "x-ms-client-request-id" : "24783976-8e0e-47a1-b2db-3a30cf0ea24b",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT"
+      "x-ms-request-id" : "c525ed60-a01e-005f-06ff-486efe000000",
+      "x-ms-client-request-id" : "bf313102-cbac-4238-ba29-3286c8395769",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc892c837378de9db81943b94d1c9e5/98eedc89198eedc892c807797d4f41ec0dc304f08965",
+    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc89cee87096e0fd5a20bda94834af4/98eedc89198eedc89cee856233b57d4ff3d25424aa65",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5c459ef9-93a8-4291-8941-619e2153fb15",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a2b47e74-6599-4702-aa58-ca14deb280e0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:54 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2459133Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE54B9CACB",
-      "x-ms-request-id" : "e630abf1-c01e-001b-71d7-41f4b2000000",
-      "x-ms-client-request-id" : "5c459ef9-93a8-4291-8941-619e2153fb15"
+      "eTag" : "0x8D917168712007D",
+      "x-ms-request-id" : "48752f7d-701e-0011-15ff-484076000000",
+      "x-ms-client-request-id" : "a2b47e74-6599-4702-aa58-ca14deb280e0"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "71e3f70a-f1d2-46c7-8b56-8e1e77f7ae24",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "32181286-54b7-4f2e-8e60-9647de86acba",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630ac73-c01e-001b-67d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>5eebd028-9f9b-4c8d-8daf-552a9e78a2a7</SignedOid><SignedTid>dc2e1a9e-fcbf-4368-8261-7ddfd0dbd498</SignedTid><SignedStart>2021-05-05T17:50:55Z</SignedStart><SignedExpiry>2021-05-06T17:50:54Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "71e3f70a-f1d2-46c7-8b56-8e1e77f7ae24",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT",
+      "x-ms-request-id" : "025750b8-b01e-0088-50ff-483fcb000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>995ff329-9d86-4e64-a472-6ecf4fc47db1</SignedOid><SignedTid>ca3c4891-a9fb-4678-a106-6fbeecea2ee1</SignedTid><SignedStart>2021-05-14T20:26:18Z</SignedStart><SignedExpiry>2021-05-15T20:26:17Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "32181286-54b7-4f2e-8e60-9647de86acba",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc892c837378de9db81943b94d1c9e5/98eedc89198eedc892c807797d4f41ec0dc304f08965?sv=2020-08-04&se=2021-05-06T17%3A50%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T17%3A50%3A55Z&ske=2021-05-06T17%3A50%3A54Z&sks=b&skv=2020-08-04&saoid=c3d9498e-10e8-4cf9-8502-5c86b6f46a1f&sr=b&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc89cee87096e0fd5a20bda94834af4/98eedc89198eedc89cee856233b57d4ff3d25424aa65?sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-14T20%3A26%3A18Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&saoid=53dea099-b2e8-46b4-adb1-b8fde9d9d12c&sr=b&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a4055832-5167-4e68-9de3-d295b07a54b6"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3eb4496b-3a5b-44dc-b02a-115daa4982ad"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:54 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:54 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2459133Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:19 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:54 GMT",
-      "eTag" : "0x8D90FEE54B9CACB",
-      "x-ms-request-id" : "e630aca7-c01e-001b-16d7-41f4b2000000",
-      "x-ms-client-request-id" : "a4055832-5167-4e68-9de3-d295b07a54b6",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D917168712007D",
+      "x-ms-request-id" : "a1f8876d-e01e-005e-59ff-483122000000",
+      "x-ms-client-request-id" : "3eb4496b-3a5b-44dc-b02a-115daa4982ad",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=98eedc89",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d3ba3bb9-9235-497d-9aea-11ec305b1d15"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630ad0a-c01e-001b-6ad7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>98eedc89</Prefix><Containers><Container><Name>98eedc89098eedc892c837378de9db81943b94d1c9e5</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:54 GMT</Last-Modified><Etag>\"0x8D90FEE54ADD1DF\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "d3ba3bb9-9235-497d-9aea-11ec305b1d15",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/98eedc89098eedc892c837378de9db81943b94d1c9e5?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "32b27a26-8c59-468d-bf1e-60eb6fc62aa4"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630ad34-c01e-001b-0ed7-41f4b2000000",
-      "x-ms-client-request-id" : "32b27a26-8c59-468d-bf1e-60eb6fc62aa4",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "98eedc89098eedc892c837378de9db81943b94d1c9e5", "98eedc89198eedc892c807797d4f41ec0dc304f08965", "2021-05-05T17:50:54.958900300Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "c3d9498e-10e8-4cf9-8502-5c86b6f46a1f" ]
+  "variables" : [ "98eedc89098eedc89cee87096e0fd5a20bda94834af4", "98eedc89198eedc89cee856233b57d4ff3d25424aa65", "2021-05-14T20:26:17.366687500Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47", "53dea099-b2e8-46b4-adb1-b8fde9d9d12c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsCanUseSasToAuthenticate.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsCanUseSasToAuthenticate.json
index 07a67a44b9ef..936df481dd8e 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsCanUseSasToAuthenticate.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsCanUseSasToAuthenticate.json
@@ -1,426 +1,402 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7b319f66-7b87-4101-bd88-f7a72cba160a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7ad6b0e3-c3c8-4e82-97e0-b0d07ff40599"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5D641C41",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "eTag" : "0x8D9171686A31843",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630c67b-c01e-001b-12d7-41f4b2000000",
-      "x-ms-client-request-id" : "7b319f66-7b87-4101-bd88-f7a72cba160a",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT"
+      "x-ms-request-id" : "26f5b427-e01e-0085-45ff-48f71f000000",
+      "x-ms-client-request-id" : "7ad6b0e3-c3c8-4e82-97e0-b0d07ff40599",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f6e52261-9711-4cbf-9361-d20bb2a1c350",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e9738b08-c519-437f-965e-faceda1d045b",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c694-c01e-001b-28d7-41f4b2000000",
-      "x-ms-client-request-id" : "f6e52261-9711-4cbf-9361-d20bb2a1c350"
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "48752f8b-701e-0011-20ff-484076000000",
+      "x-ms-client-request-id" : "e9738b08-c519-437f-965e-faceda1d045b"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4d8d7e3a-9347-4374-b1f8-615fda736f91"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4b3cfea2-43be-42cb-a053-44076228045c"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c6bb-c01e-001b-4bd7-41f4b2000000",
-      "x-ms-client-request-id" : "4d8d7e3a-9347-4374-b1f8-615fda736f91",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "a1f8856a-e01e-005e-29ff-483122000000",
+      "x-ms-client-request-id" : "4b3cfea2-43be-42cb-a053-44076228045c",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8cc4c14c-3e2e-4b98-a8ea-fe73f04557c9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "28518efa-96b8-414d-892c-3e435949a0e5"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:08 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c6df-c01e-001b-6bd7-41f4b2000000",
-      "x-ms-client-request-id" : "8cc4c14c-3e2e-4b98-a8ea-fe73f04557c9",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "02575005-b01e-0088-48ff-483fcb000000",
+      "x-ms-client-request-id" : "28518efa-96b8-414d-892c-3e435949a0e5",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "90d4bb03-b6fc-45ca-b4de-7cb7feb65441"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e8b619cb-67f0-49bd-a5ae-c2e4a103c246"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c6fb-c01e-001b-04d7-41f4b2000000",
-      "x-ms-client-request-id" : "90d4bb03-b6fc-45ca-b4de-7cb7feb65441",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "49ad3ba8-601e-008b-33ff-48deaf000000",
+      "x-ms-client-request-id" : "e8b619cb-67f0-49bd-a5ae-c2e4a103c246",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6283e2be-3efc-40b5-8842-d5578e870b83"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "027e3d2d-1576-4e83-8c5b-b29ff8ffcd0e"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c720-c01e-001b-26d7-41f4b2000000",
-      "x-ms-client-request-id" : "6283e2be-3efc-40b5-8842-d5578e870b83",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "a1f88696-e01e-005e-25ff-483122000000",
+      "x-ms-client-request-id" : "027e3d2d-1576-4e83-8c5b-b29ff8ffcd0e",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7bc34eba-ad7d-4afc-99f9-cecbc1447190"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4e853a1b-e542-4eb9-bd6e-7e1e1f22d54a"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c740-c01e-001b-41d7-41f4b2000000",
-      "x-ms-client-request-id" : "7bc34eba-ad7d-4afc-99f9-cecbc1447190",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "53854a5b-d01e-0045-54ff-480f21000000",
+      "x-ms-client-request-id" : "4e853a1b-e542-4eb9-bd6e-7e1e1f22d54a",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90/95ce156e195ce156ee3d03359e479c743a40845e19a8?sv=2020-08-04&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a/95ce156e195ce156e6c9477286f2b3b9fea5241d2b70?sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ee3e2c61-7325-4d07-90b8-706b090cd94c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5035eef9-bc49-4121-abe4-a0d098a25a22"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "7",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3119607Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:09 GMT",
-      "eTag" : "0x8D90FEE5D7065C9",
-      "x-ms-request-id" : "e630c755-c01e-001b-53d7-41f4b2000000",
-      "x-ms-client-request-id" : "ee3e2c61-7325-4d07-90b8-706b090cd94c",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:26:17 GMT",
+      "eTag" : "0x8D91716871C1477",
+      "x-ms-request-id" : "8fc45b50-e01e-0013-41ff-48fece000000",
+      "x-ms-client-request-id" : "5035eef9-bc49-4121-abe4-a0d098a25a22",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "67efb755-454d-4a54-a0b4-14c748b7c147"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0a1fed40-d5d6-4801-9427-60df3f8363a4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEE5D641C41",
-      "x-ms-request-id" : "e630c779-c01e-001b-6fd7-41f4b2000000",
-      "x-ms-client-request-id" : "67efb755-454d-4a54-a0b4-14c748b7c147"
+      "eTag" : "0x8D9171686A31843",
+      "x-ms-request-id" : "acc126a3-e01e-0095-6bff-483277000000",
+      "x-ms-client-request-id" : "0a1fed40-d5d6-4801-9427-60df3f8363a4"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2ad23ec6-409d-4a19-967f-2b66ea0e2a77"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "663b0397-ba60-4d1f-bb1d-416715820320"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEE5D641C41",
-      "x-ms-request-id" : "e630c795-c01e-001b-08d7-41f4b2000000",
-      "x-ms-client-request-id" : "2ad23ec6-409d-4a19-967f-2b66ea0e2a77"
+      "eTag" : "0x8D9171686A31843",
+      "x-ms-request-id" : "49ad3deb-601e-008b-49ff-48deaf000000",
+      "x-ms-client-request-id" : "663b0397-ba60-4d1f-bb1d-416715820320"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90?restype=container&sv=2020-08-04&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156e6c905386cfd9a0803b5944c9b2a?restype=container&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "582c31f6-9931-47b7-87b7-c0e88d593f66"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7e150ed6-bdae-4e7c-bca0-da6698276317"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "false",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
       "x-ms-deny-encryption-scope-override" : "false",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "x-ms-default-encryption-scope" : "$account-encryption-key",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D90FEE5D641C41",
-      "x-ms-request-id" : "e630c7c2-c01e-001b-31d7-41f4b2000000",
-      "x-ms-client-request-id" : "582c31f6-9931-47b7-87b7-c0e88d593f66"
+      "eTag" : "0x8D9171686A31843",
+      "x-ms-request-id" : "8fc45c09-e01e-0013-5eff-48fece000000",
+      "x-ms-client-request-id" : "7e150ed6-bdae-4e7c-bca0-da6698276317"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5f5f80f4-88da-4338-85f7-42c648bb7bf2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d0295b6c-12fc-4d38-9072-442c15f73ba4"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630c7f0-c01e-001b-54d7-41f4b2000000",
+      "x-ms-request-id" : "8fc45c24-e01e-0013-78ff-48fece000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /><DeleteRetentionPolicy><Enabled>false</Enabled><AllowPermanentDelete>false</AllowPermanentDelete></DeleteRetentionPolicy><StaticWebsite><Enabled>false</Enabled></StaticWebsite><DefaultServiceVersion>2018-03-28</DefaultServiceVersion></StorageServiceProperties>",
-      "x-ms-client-request-id" : "5f5f80f4-88da-4338-85f7-42c648bb7bf2",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "x-ms-client-request-id" : "d0295b6c-12fc-4d38-9072-442c15f73ba4",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=b&srt=sco&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "02b2faeb-d47c-4293-a35a-0acaeae6d746"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8dd65668-de92-45f1-9e7c-6bb413036a86"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630c807-c01e-001b-68d7-41f4b2000000",
+      "x-ms-request-id" : "8fc45c7a-e01e-0013-48ff-48fece000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /><DeleteRetentionPolicy><Enabled>false</Enabled><AllowPermanentDelete>false</AllowPermanentDelete></DeleteRetentionPolicy><StaticWebsite><Enabled>false</Enabled></StaticWebsite><DefaultServiceVersion>2018-03-28</DefaultServiceVersion></StorageServiceProperties>",
-      "x-ms-client-request-id" : "02b2faeb-d47c-4293-a35a-0acaeae6d746",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "x-ms-client-request-id" : "8dd65668-de92-45f1-9e7c-6bb413036a86",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&se=2021-05-06T17%3A51%3A09Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "08643c5e-eaed-49ba-860f-8afa626c62ca"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "febca7c5-3621-4766-818e-8a86d67829bc"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630c822-c01e-001b-7cd7-41f4b2000000",
+      "x-ms-request-id" : "8fc45cb5-e01e-0013-01ff-48fece000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /><DeleteRetentionPolicy><Enabled>false</Enabled><AllowPermanentDelete>false</AllowPermanentDelete></DeleteRetentionPolicy><StaticWebsite><Enabled>false</Enabled></StaticWebsite><DefaultServiceVersion>2018-03-28</DefaultServiceVersion></StorageServiceProperties>",
-      "x-ms-client-request-id" : "08643c5e-eaed-49ba-860f-8afa626c62ca",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
+      "x-ms-client-request-id" : "febca7c5-3621-4766-818e-8a86d67829bc",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=95ce156e",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4cc3f440-0b75-45e2-802d-2bd58ac31462"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630c83a-c01e-001b-12d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>95ce156e</Prefix><Containers><Container><Name>95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:09 GMT</Last-Modified><Etag>\"0x8D90FEE5D641C41\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4cc3f440-0b75-45e2-802d-2bd58ac31462",
-      "Date" : "Wed, 05 May 2021 17:51:09 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8bc00f4e-4612-4b71-93ee-a730c7a892c5"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630c864-c01e-001b-33d7-41f4b2000000",
-      "x-ms-client-request-id" : "8bc00f4e-4612-4b71-93ee-a730c7a892c5",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "95ce156e095ce156ee3d997437a67ebf5e1e04b1ab90", "95ce156e195ce156ee3d03359e479c743a40845e19a8", "2021-05-05T17:51:09.577175200Z" ]
+  "variables" : [ "95ce156e095ce156e6c905386cfd9a0803b5944c9b2a", "95ce156e195ce156e6c9477286f2b3b9fea5241d2b70", "2021-05-14T20:26:17.447685500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasIdentifierAndPermissions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasIdentifierAndPermissions.json
index 5843b86e6967..67a87b9214ab 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasIdentifierAndPermissions.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasIdentifierAndPermissions.json
@@ -1,154 +1,115 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e997e0d56924035263d69b044e9c9db?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ddf442c6-4826-4d45-89f8-3e489df33c24"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3b5a1dcc-154e-4c6a-8366-49b02ad6d4bb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4C7E8374",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:40 GMT",
+      "eTag" : "0x8D9171686A621B5",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6308f68-c01e-001b-18d7-41f4b2000000",
-      "x-ms-client-request-id" : "ddf442c6-4826-4d45-89f8-3e489df33c24",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT"
+      "x-ms-request-id" : "e7188f2a-d01e-0055-07ff-48ca49000000",
+      "x-ms-client-request-id" : "3b5a1dcc-154e-4c6a-8366-49b02ad6d4bb",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e/8584e99718584e99705d4575493be2e38be0c498399f",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e997e0d56924035263d69b044e9c9db/8584e99718584e997e0d4542640a8af8298cd4e01a3d",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f4bf43cb-ffd5-4156-97a8-2b545a1d14d0",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b0208e09-5ba3-4812-8bf0-4d9fde82183b",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4170351Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE4C8B649B",
-      "x-ms-request-id" : "e6308f9f-c01e-001b-48d7-41f4b2000000",
-      "x-ms-client-request-id" : "f4bf43cb-ffd5-4156-97a8-2b545a1d14d0"
+      "eTag" : "0x8D91716872C1CEF",
+      "x-ms-request-id" : "48752fa0-701e-0011-31ff-484076000000",
+      "x-ms-client-request-id" : "b0208e09-5ba3-4812-8bf0-4d9fde82183b"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e?restype=container&comp=acl",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e997e0d56924035263d69b044e9c9db?restype=container&comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2181fb64-1138-4df1-9cac-ce76f3f88d5c",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "adbdda92-27c8-458d-a1a4-8d2848c557d7",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4C97C494",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:41 GMT",
+      "eTag" : "0x8D91716875CC5DE",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e6308fd2-c01e-001b-6ed7-41f4b2000000",
-      "x-ms-client-request-id" : "2181fb64-1138-4df1-9cac-ce76f3f88d5c",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT"
+      "x-ms-request-id" : "5de8207a-a01e-003d-55ff-48acd9000000",
+      "x-ms-client-request-id" : "adbdda92-27c8-458d-a1a4-8d2848c557d7",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e?restype=container&comp=list&sv=2020-08-04&si=0000&sr=c&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e997e0d56924035263d69b044e9c9db?restype=container&comp=list&sv=2020-10-02&si=0000&sr=c&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9585ecb7-858f-49df-9ccd-dc255a2d70dc"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bc77a521-3a07-4efe-ac6f-c6b0c1b0a599"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630900e-c01e-001b-22d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\" ContainerName=\"8584e99708584e99705d86147d763059520314398b3e\"><Blobs><Blob><Name>8584e99718584e99705d4575493be2e38be0c498399f</Name><Properties><Creation-Time>Wed, 05 May 2021 17:50:41 GMT</Creation-Time><Last-Modified>Wed, 05 May 2021 17:50:41 GMT</Last-Modified><Etag>0x8D90FEE4C8B649B</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Wed, 05 May 2021 17:50:41 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9585ecb7-858f-49df-9ccd-dc255a2d70dc",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT",
+      "x-ms-request-id" : "acc12548-e01e-0095-39ff-483277000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"8584e99708584e997e0d56924035263d69b044e9c9db\"><Blobs><Blob><Name>8584e99718584e997e0d4542640a8af8298cd4e01a3d</Name><VersionId>2021-05-14T20:26:17.4170351Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Fri, 14 May 2021 20:26:17 GMT</Creation-Time><Last-Modified>Fri, 14 May 2021 20:26:17 GMT</Last-Modified><Etag>0x8D91716872C1CEF</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Fri, 14 May 2021 20:26:17 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "bc77a521-3a07-4efe-ac6f-c6b0c1b0a599",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e?restype=container&comp=list&sv=2020-08-04&se=2021-05-06T17%3A50%3A41Z&sr=c&sp=racwdlme&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e997e0d56924035263d69b044e9c9db?restype=container&comp=list&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sr=c&sp=racwdlme&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6ad9f5d6-1000-4e63-9dbe-d4b339822e0c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1318496a-bd47-4157-9d0d-cdbc786c8312"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630904e-c01e-001b-61d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\" ContainerName=\"8584e99708584e99705d86147d763059520314398b3e\"><Blobs><Blob><Name>8584e99718584e99705d4575493be2e38be0c498399f</Name><Properties><Creation-Time>Wed, 05 May 2021 17:50:41 GMT</Creation-Time><Last-Modified>Wed, 05 May 2021 17:50:41 GMT</Last-Modified><Etag>0x8D90FEE4C8B649B</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Wed, 05 May 2021 17:50:41 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "6ad9f5d6-1000-4e63-9dbe-d4b339822e0c",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT",
+      "x-ms-request-id" : "2290b7cd-d01e-0037-12ff-48086e000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"8584e99708584e997e0d56924035263d69b044e9c9db\"><Blobs><Blob><Name>8584e99718584e997e0d4542640a8af8298cd4e01a3d</Name><VersionId>2021-05-14T20:26:17.4170351Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Fri, 14 May 2021 20:26:17 GMT</Creation-Time><Last-Modified>Fri, 14 May 2021 20:26:17 GMT</Last-Modified><Etag>0x8D91716872C1CEF</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Fri, 14 May 2021 20:26:17 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "1318496a-bd47-4157-9d0d-cdbc786c8312",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=8584e997",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "24f46ba2-3bd9-4ad6-b394-70f7cd261bfb"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6309071-c01e-001b-04d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>8584e997</Prefix><Containers><Container><Name>8584e99708584e99705d86147d763059520314398b3e</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:41 GMT</Last-Modified><Etag>\"0x8D90FEE4C97C494\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "24f46ba2-3bd9-4ad6-b394-70f7cd261bfb",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8584e99708584e99705d86147d763059520314398b3e?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d4c7024e-8d21-4534-b7ee-c6f57f9476f0"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e6309097-c01e-001b-29d7-41f4b2000000",
-      "x-ms-client-request-id" : "d4c7024e-8d21-4534-b7ee-c6f57f9476f0",
-      "Date" : "Wed, 05 May 2021 17:50:40 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "8584e99708584e99705d86147d763059520314398b3e", "8584e99718584e99705d4575493be2e38be0c498399f", "2021-05-05T17:50:41.233722700Z", "2021-05-05T17:50:41.322724200Z" ]
+  "variables" : [ "8584e99708584e997e0d56924035263d69b044e9c9db", "8584e99718584e997e0d4542640a8af8298cd4e01a3d", "2021-05-14T20:26:17.548686700Z", "2021-05-14T20:26:17.849688200Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTags.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTags.json
index b8dfdce46f75..8bf2d59b5b69 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTags.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTags.json
@@ -1,130 +1,91 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6bd9172714286eee8dc676460ca16?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b2105909-f482-4a35-b2ac-b66d35f49f1d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2bea5dfe-331c-488a-aa79-a84bb55afb4d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE52E28210",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:51 GMT",
+      "eTag" : "0x8D9171686A2FC3C",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630a47b-c01e-001b-05d7-41f4b2000000",
-      "x-ms-client-request-id" : "b2105909-f482-4a35-b2ac-b66d35f49f1d",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT"
+      "x-ms-request-id" : "be480747-a01e-0084-49ff-48a8c3000000",
+      "x-ms-client-request-id" : "2bea5dfe-331c-488a-aa79-a84bb55afb4d",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6bd9172714286eee8dc676460ca16/e288aa6b1e288aa6bd9167451bb8a32f60bcc436fa0b",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f/e288aa6b1e288aa6b5db813878d81914e9f8d483ea3d",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0550934e-6422-4040-aad7-990289bb85a0",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bc58fc36-c983-493d-b1e8-cf363b81f330",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:51 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.1598526Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE52EE7A67",
-      "x-ms-request-id" : "e630a4af-c01e-001b-2fd7-41f4b2000000",
-      "x-ms-client-request-id" : "0550934e-6422-4040-aad7-990289bb85a0"
+      "eTag" : "0x8D917168704DEBE",
+      "x-ms-request-id" : "49ad38f5-601e-008b-2aff-48deaf000000",
+      "x-ms-client-request-id" : "bc58fc36-c983-493d-b1e8-cf363b81f330"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6bd9172714286eee8dc676460ca16/e288aa6b1e288aa6bd9167451bb8a32f60bcc436fa0b?comp=tags&sv=2020-08-04&se=2021-05-06T17%3A50%3A51Z&sr=c&sp=racwdxlt&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f/e288aa6b1e288aa6b5db813878d81914e9f8d483ea3d?comp=tags&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sr=c&sp=racwdxlt&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a41551cc-082a-4889-bf4f-9f31be6aef3e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0e5bbbe1-00a4-4341-90d6-e6c9655eb484",
       "Content-Type" : "application/xml"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "e630a4eb-c01e-001b-61d7-41f4b2000000",
-      "x-ms-client-request-id" : "a41551cc-082a-4889-bf4f-9f31be6aef3e",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT"
+      "x-ms-request-id" : "49ad3a96-601e-008b-2cff-48deaf000000",
+      "x-ms-client-request-id" : "0e5bbbe1-00a4-4341-90d6-e6c9655eb484",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6bd9172714286eee8dc676460ca16/e288aa6b1e288aa6bd9167451bb8a32f60bcc436fa0b?comp=tags&sv=2020-08-04&se=2021-05-06T17%3A50%3A51Z&sr=c&sp=racwdxlt&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f/e288aa6b1e288aa6b5db813878d81914e9f8d483ea3d?comp=tags&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sr=c&sp=racwdxlt&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "38b23d37-501b-455c-a7de-ca295e83474c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d74fb3af-cd1d-4134-af3e-3aa00e2f674b"
     },
     "Response" : {
       "content-length" : "115",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630a51d-c01e-001b-09d7-41f4b2000000",
+      "x-ms-request-id" : "5de82106-a01e-003d-50ff-48acd9000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Tags><TagSet><Tag><Key>foo</Key><Value>bar</Value></Tag></TagSet></Tags>",
-      "x-ms-client-request-id" : "38b23d37-501b-455c-a7de-ca295e83474c",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
+      "x-ms-client-request-id" : "d74fb3af-cd1d-4134-af3e-3aa00e2f674b",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=e288aa6b",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ea579f6d-336a-4ad4-a889-4bfbc5e69626"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630a556-c01e-001b-37d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>e288aa6b</Prefix><Containers><Container><Name>e288aa6b0e288aa6bd9172714286eee8dc676460ca16</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:51 GMT</Last-Modified><Etag>\"0x8D90FEE52E28210\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ea579f6d-336a-4ad4-a889-4bfbc5e69626",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e288aa6b0e288aa6bd9172714286eee8dc676460ca16?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "72e3f469-069f-4804-b11f-29680cd9c73b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630a58e-c01e-001b-67d7-41f4b2000000",
-      "x-ms-client-request-id" : "72e3f469-069f-4804-b11f-29680cd9c73b",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "e288aa6b0e288aa6bd9172714286eee8dc676460ca16", "e288aa6b1e288aa6bd9167451bb8a32f60bcc436fa0b", "2021-05-05T17:50:51.971844Z" ]
+  "variables" : [ "e288aa6b0e288aa6b5db91908c1b6947e98a94c1d97f", "e288aa6b1e288aa6b5db813878d81914e9f8d483ea3d", "2021-05-14T20:26:17.292686500Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTagsFail.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTagsFail.json
index ab04696e06d3..498d6e06dc22 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTagsFail.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasTagsFail.json
@@ -1,113 +1,74 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd43411830679b1ebc78a1540e59ea?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd44cc727951e8b4dc484bf4bb7a4b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3112a38e-b9ae-4460-951b-2de469f0851f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ba0a2cfe-0e1c-4889-978e-dfc9b8dc5872"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5337413A",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:52 GMT",
+      "eTag" : "0x8D9171686A65590",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630a5d9-c01e-001b-22d7-41f4b2000000",
-      "x-ms-client-request-id" : "3112a38e-b9ae-4460-951b-2de469f0851f",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT"
+      "x-ms-request-id" : "81d0b5dd-401e-0035-41ff-48b6d6000000",
+      "x-ms-client-request-id" : "ba0a2cfe-0e1c-4889-978e-dfc9b8dc5872",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd43411830679b1ebc78a1540e59ea/a383bdd41a383bdd4341377357b61dbcbb18643e59a1",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd44cc727951e8b4dc484bf4bb7a4b/a383bdd41a383bdd44cc766399d0be068602640acaae",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ddb28730-2bd9-42f2-840a-37a1d8e59a82",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b705a1e9-3bd4-4ed3-b768-825d3acf904a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:52 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.3079578Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE534360D4",
-      "x-ms-request-id" : "e630a60a-c01e-001b-4dd7-41f4b2000000",
-      "x-ms-client-request-id" : "ddb28730-2bd9-42f2-840a-37a1d8e59a82"
+      "eTag" : "0x8D91716871B781A",
+      "x-ms-request-id" : "49ad394a-601e-008b-76ff-48deaf000000",
+      "x-ms-client-request-id" : "b705a1e9-3bd4-4ed3-b768-825d3acf904a"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd43411830679b1ebc78a1540e59ea/a383bdd41a383bdd4341377357b61dbcbb18643e59a1?comp=tags&sv=2020-08-04&se=2021-05-06T17%3A50%3A52Z&sr=b&sp=racwd&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd44cc727951e8b4dc484bf4bb7a4b/a383bdd41a383bdd44cc766399d0be068602640acaae?comp=tags&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&sr=b&sp=racwd&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "db1b8116-df36-48e3-9f4e-bd05d87465fb",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "312a1a4c-38e4-47d7-9798-0a5361d4dc54",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "280",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630a62c-c01e-001b-69d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:e630a62c-c01e-001b-69d7-41f4b2000000\nTime:2021-05-05T17:50:52.3950139Z</Message></Error>",
-      "x-ms-client-request-id" : "db1b8116-df36-48e3-9f4e-bd05d87465fb",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
+      "x-ms-request-id" : "8fc458fb-e01e-0013-2bff-48fece000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:8fc458fb-e01e-0013-2bff-48fece000000\nTime:2021-05-14T20:26:17.8584849Z</Message></Error>",
+      "x-ms-client-request-id" : "312a1a4c-38e4-47d7-9798-0a5361d4dc54",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=a383bdd4",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a677d7f2-6f97-45b8-aabd-52972977f3a6"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630a654-c01e-001b-08d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>a383bdd4</Prefix><Containers><Container><Name>a383bdd40a383bdd43411830679b1ebc78a1540e59ea</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:52 GMT</Last-Modified><Etag>\"0x8D90FEE5337413A\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "a677d7f2-6f97-45b8-aabd-52972977f3a6",
-      "Date" : "Wed, 05 May 2021 17:50:51 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/a383bdd40a383bdd43411830679b1ebc78a1540e59ea?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a852d01a-2430-43ca-8b9b-30579dd2cbb9"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630a673-c01e-001b-26d7-41f4b2000000",
-      "x-ms-client-request-id" : "a852d01a-2430-43ca-8b9b-30579dd2cbb9",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "a383bdd40a383bdd43411830679b1ebc78a1540e59ea", "a383bdd41a383bdd4341377357b61dbcbb18643e59a1", "2021-05-05T17:50:52.503969800Z" ]
+  "variables" : [ "a383bdd40a383bdd44cc727951e8b4dc484bf4bb7a4b", "a383bdd41a383bdd44cc766399d0be068602640acaae", "2021-05-14T20:26:17.438685900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasUserDelegation.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasUserDelegation.json
index 30b107fc96bc..7800cb1c2236 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasUserDelegation.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerSasUserDelegation.json
@@ -1,133 +1,94 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da1a9072514d4375a107d1c47d4955?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da17be45148e422f27b02c24ef19c4?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2c166100-a360-4bc1-9dc9-12b7633efbf8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "73eedfd7-fef6-432b-9748-48dec47ff192"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5095B55D",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:47 GMT",
+      "eTag" : "0x8D9171686A66878",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6309bfb-c01e-001b-3bd7-41f4b2000000",
-      "x-ms-client-request-id" : "2c166100-a360-4bc1-9dc9-12b7633efbf8",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT"
+      "x-ms-request-id" : "1edf91e8-401e-0057-18ff-4874f1000000",
+      "x-ms-client-request-id" : "73eedfd7-fef6-432b-9748-48dec47ff192",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da1a9072514d4375a107d1c47d4955/4eff2da114eff2da1a90207641a67c053414d4f7b936",
+    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da17be45148e422f27b02c24ef19c4/4eff2da114eff2da17be744167a9dbd8ae0e148fd8c3",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "297b878f-b5e2-42c8-ac1e-8e1d8935d887",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c5697705-07df-4f4b-933e-40d0f61b540b",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:47 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.2439119Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE50A270A8",
-      "x-ms-request-id" : "e6309c29-c01e-001b-5fd7-41f4b2000000",
-      "x-ms-client-request-id" : "297b878f-b5e2-42c8-ac1e-8e1d8935d887"
+      "eTag" : "0x8D9171687118B35",
+      "x-ms-request-id" : "49ad3923-601e-008b-55ff-48deaf000000",
+      "x-ms-client-request-id" : "c5697705-07df-4f4b-933e-40d0f61b540b"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "163bb3fe-b65e-4993-bc30-98add9ba43fd",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "91389f14-bf49-424e-ad9a-76499991d08c",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e6309cda-c01e-001b-79d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>46c66ee1-3b65-4992-98fb-b9bd5bc5c573</SignedOid><SignedTid>71949360-dc29-44b5-9d62-957a6824d3fe</SignedTid><SignedStart>2021-05-04T17:50:48Z</SignedStart><SignedExpiry>2021-05-06T17:50:48Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "163bb3fe-b65e-4993-bc30-98add9ba43fd",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT",
+      "x-ms-request-id" : "025750ac-b01e-0088-48ff-483fcb000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>e35e3701-10d1-4b8b-a8eb-f668c9699c35</SignedOid><SignedTid>cc3cb84f-c896-4f6e-adb7-cf8a5c518b82</SignedTid><SignedStart>2021-05-13T20:26:17Z</SignedStart><SignedExpiry>2021-05-15T20:26:17Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "91389f14-bf49-424e-ad9a-76499991d08c",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da1a9072514d4375a107d1c47d4955?restype=container&comp=list&sv=2020-08-04&se=2021-05-06T17%3A50%3A48Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T17%3A50%3A48Z&ske=2021-05-06T17%3A50%3A48Z&sks=b&skv=2020-08-04&sr=c&sp=racwdl&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da17be45148e422f27b02c24ef19c4?restype=container&comp=list&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-13T20%3A26%3A17Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&sr=c&sp=racwdl&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c8f4a2d4-333d-402c-9319-af860da517b2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "00349a90-6dae-4bd6-b5de-9c341fcdbcee"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e6309d07-c01e-001b-1fd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\" ContainerName=\"4eff2da104eff2da1a9072514d4375a107d1c47d4955\"><Blobs><Blob><Name>4eff2da114eff2da1a90207641a67c053414d4f7b936</Name><Properties><Creation-Time>Wed, 05 May 2021 17:50:47 GMT</Creation-Time><Last-Modified>Wed, 05 May 2021 17:50:47 GMT</Last-Modified><Etag>0x8D90FEE50A270A8</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Wed, 05 May 2021 17:50:47 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c8f4a2d4-333d-402c-9319-af860da517b2",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT",
+      "x-ms-request-id" : "6b150860-f01e-0089-40ff-486017000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"4eff2da104eff2da17be45148e422f27b02c24ef19c4\"><Blobs><Blob><Name>4eff2da114eff2da17be744167a9dbd8ae0e148fd8c3</Name><VersionId>2021-05-14T20:26:17.2439119Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Fri, 14 May 2021 20:26:17 GMT</Creation-Time><Last-Modified>Fri, 14 May 2021 20:26:17 GMT</Last-Modified><Etag>0x8D9171687118B35</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Fri, 14 May 2021 20:26:17 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "00349a90-6dae-4bd6-b5de-9c341fcdbcee",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=4eff2da1",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fecbbd23-cd9c-4252-bd46-07d57fe06b95"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6309d2f-c01e-001b-43d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>4eff2da1</Prefix><Containers><Container><Name>4eff2da104eff2da1a9072514d4375a107d1c47d4955</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:47 GMT</Last-Modified><Etag>\"0x8D90FEE5095B55D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "fecbbd23-cd9c-4252-bd46-07d57fe06b95",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/4eff2da104eff2da1a9072514d4375a107d1c47d4955?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0db58bae-451a-4ec4-814d-66e26be7919f"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e6309d4c-c01e-001b-5cd7-41f4b2000000",
-      "x-ms-client-request-id" : "0db58bae-451a-4ec4-814d-66e26be7919f",
-      "Date" : "Wed, 05 May 2021 17:50:47 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "4eff2da104eff2da1a9072514d4375a107d1c47d4955", "4eff2da114eff2da1a90207641a67c053414d4f7b936", "2021-05-05T17:50:48.094877700Z", "2021-05-05T17:50:48.097873400Z", "2021-05-05T17:50:48.097873400Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
+  "variables" : [ "4eff2da104eff2da17be45148e422f27b02c24ef19c4", "4eff2da114eff2da17be744167a9dbd8ae0e148fd8c3", "2021-05-14T20:26:17.357689300Z", "2021-05-14T20:26:17.472687200Z", "2021-05-14T20:26:17.472687200Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationId.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationId.json
index 29da5b333085..70dce7ce260e 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationId.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationId.json
@@ -1,133 +1,94 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71f0f00207949049e4362241a9b4a?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71a1f68229dac354a9947a489caca?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8edd5b10-9305-4f9d-a6b1-4f28326e035b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fc3dac7c-b059-4cf9-be0a-408a69fd9d0f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5523DAC0",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:55 GMT",
+      "eTag" : "0x8D9171686A65F67",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630ad58-c01e-001b-2dd7-41f4b2000000",
-      "x-ms-client-request-id" : "8edd5b10-9305-4f9d-a6b1-4f28326e035b",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT"
+      "x-ms-request-id" : "99674a36-d01e-0018-17ff-4805a5000000",
+      "x-ms-client-request-id" : "fc3dac7c-b059-4cf9-be0a-408a69fd9d0f",
+      "Date" : "Fri, 14 May 2021 20:26:15 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71f0f00207949049e4362241a9b4a/ca694d711ca694d71f0f0039489a418b88fed424396f",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71a1f68229dac354a9947a489caca/ca694d711ca694d71a1f29314e7d9f8809fce45858a7",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5616b465-fc39-4068-b6d7-4dc8cd9da468",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2f6cb593-e550-4ed3-945c-bc0ee9939ab0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:55 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4820811Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:54 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:17 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE552FFADA",
-      "x-ms-request-id" : "e630ad84-c01e-001b-54d7-41f4b2000000",
-      "x-ms-client-request-id" : "5616b465-fc39-4068-b6d7-4dc8cd9da468"
+      "eTag" : "0x8D91716873609CB",
+      "x-ms-request-id" : "acc12481-e01e-0095-06ff-483277000000",
+      "x-ms-client-request-id" : "2f6cb593-e550-4ed3-945c-bc0ee9939ab0"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "95cd6c74-667a-4d66-b052-b20df18af6d5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "35d21632-d0f8-4323-8ba9-e212c74151fc",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630adf7-c01e-001b-3cd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>c8943df5-545d-491b-8032-d7748f3c66e6</SignedOid><SignedTid>17d5ecb3-89cf-47fa-905a-1b4ee4f13b82</SignedTid><SignedStart>2021-05-05T17:50:55Z</SignedStart><SignedExpiry>2021-05-06T17:50:55Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "95cd6c74-667a-4d66-b052-b20df18af6d5",
-      "Date" : "Wed, 05 May 2021 17:50:55 GMT",
+      "x-ms-request-id" : "5de82168-a01e-003d-1eff-48acd9000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>0f664b99-b9b8-4524-b169-0c4c5511a8c6</SignedOid><SignedTid>6c7396b3-bd2e-4324-96e6-9e3e50e057e2</SignedTid><SignedStart>2021-05-14T20:26:18Z</SignedStart><SignedExpiry>2021-05-15T20:26:17Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "35d21632-d0f8-4323-8ba9-e212c74151fc",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71f0f00207949049e4362241a9b4a?restype=container&comp=list&sv=2020-08-04&se=2021-05-06T17%3A50%3A55Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T17%3A50%3A55Z&ske=2021-05-06T17%3A50%3A55Z&sks=b&skv=2020-08-04&scid=1f7814ab-9462-4c09-83fe-b2cc83331799&sr=c&sp=l&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71a1f68229dac354a9947a489caca?restype=container&comp=list&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-14T20%3A26%3A18Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&scid=a0c50ce3-c631-4cb7-a150-1ed061f394a6&sr=c&sp=l&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9037566d-c2e4-45ed-a1f5-2771fe6b3164"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d8c9ff11-5a69-4e06-886d-faea32ed2af7"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630ae23-c01e-001b-61d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\" ContainerName=\"ca694d710ca694d71f0f00207949049e4362241a9b4a\"><Blobs><Blob><Name>ca694d711ca694d71f0f0039489a418b88fed424396f</Name><Properties><Creation-Time>Wed, 05 May 2021 17:50:55 GMT</Creation-Time><Last-Modified>Wed, 05 May 2021 17:50:55 GMT</Last-Modified><Etag>0x8D90FEE552FFADA</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Wed, 05 May 2021 17:50:55 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9037566d-c2e4-45ed-a1f5-2771fe6b3164",
-      "Date" : "Wed, 05 May 2021 17:50:55 GMT",
+      "x-ms-request-id" : "025750c8-b01e-0088-5eff-483fcb000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"ca694d710ca694d71a1f68229dac354a9947a489caca\"><Blobs><Blob><Name>ca694d711ca694d71a1f29314e7d9f8809fce45858a7</Name><VersionId>2021-05-14T20:26:17.4820811Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Fri, 14 May 2021 20:26:17 GMT</Creation-Time><Last-Modified>Fri, 14 May 2021 20:26:17 GMT</Last-Modified><Etag>0x8D91716873609CB</Etag><Content-Length>7</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>wh+Wm18D0z1D4E+PE252gg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Fri, 14 May 2021 20:26:17 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "d8c9ff11-5a69-4e06-886d-faea32ed2af7",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=ca694d71",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0bc861c3-92d5-4c09-bb36-fba0e0203195"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630ae52-c01e-001b-0cd7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>ca694d71</Prefix><Containers><Container><Name>ca694d710ca694d71f0f00207949049e4362241a9b4a</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:55 GMT</Last-Modified><Etag>\"0x8D90FEE5523DAC0\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "0bc861c3-92d5-4c09-bb36-fba0e0203195",
-      "Date" : "Wed, 05 May 2021 17:50:55 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ca694d710ca694d71f0f00207949049e4362241a9b4a?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "46634095-7b55-476c-911a-9d6d373d564b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630ae6f-c01e-001b-26d7-41f4b2000000",
-      "x-ms-client-request-id" : "46634095-7b55-476c-911a-9d6d373d564b",
-      "Date" : "Wed, 05 May 2021 17:50:57 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "ca694d710ca694d71f0f00207949049e4362241a9b4a", "ca694d711ca694d71f0f0039489a418b88fed424396f", "2021-05-05T17:50:55.732581700Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "1f7814ab-9462-4c09-83fe-b2cc83331799" ]
+  "variables" : [ "ca694d710ca694d71a1f68229dac354a9947a489caca", "ca694d711ca694d71a1f29314e7d9f8809fce45858a7", "2021-05-14T20:26:17.585687800Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47", "a0c50ce3-c631-4cb7-a150-1ed061f394a6" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationIdError.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationIdError.json
index 2a032198a900..8613ac65c562 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationIdError.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/SasClientTestsContainerUserDelegationCorrelationIdError.json
@@ -1,79 +1,80 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158172d58970045172c355a04d8ca6d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158181970281653815d3e4d54898a98?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "03d454c0-54fe-4606-b2f8-a79da4f0fff0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "30d59c06-5e2c-4d3f-a464-e6e00e547781"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE56BCEDE1",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:58 GMT",
+      "eTag" : "0x8D9171686A8CB70",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:16 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630b2d6-c01e-001b-0cd7-41f4b2000000",
-      "x-ms-client-request-id" : "03d454c0-54fe-4606-b2f8-a79da4f0fff0",
-      "Date" : "Wed, 05 May 2021 17:50:57 GMT"
+      "x-ms-request-id" : "a0d0c79f-a01e-002d-72ff-4869b1000000",
+      "x-ms-client-request-id" : "30d59c06-5e2c-4d3f-a464-e6e00e547781",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158172d58970045172c355a04d8ca6d/47c31581147c3158172d947502ef08df3bd794397a26",
+    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158181970281653815d3e4d54898a98/47c31581147c31581819392900a4fd55a68194047bdd",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bc5c3d30-fe2f-4e8e-b7c5-4cba28b873c5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7937cabb-b929-4aac-87e9-38b81eb68cd9",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "6RYQPwaVsyQ=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:58 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:26:17 GMT",
+      "x-ms-version-id" : "2021-05-14T20:26:17.4150332Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:57 GMT",
+      "Date" : "Fri, 14 May 2021 20:26:16 GMT",
       "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
-      "eTag" : "0x8D90FEE56C90E92",
-      "x-ms-request-id" : "e630b300-c01e-001b-33d7-41f4b2000000",
-      "x-ms-client-request-id" : "bc5c3d30-fe2f-4e8e-b7c5-4cba28b873c5"
+      "eTag" : "0x8D91716872BCEBC",
+      "x-ms-request-id" : "49ad3983-601e-008b-2dff-48deaf000000",
+      "x-ms-client-request-id" : "7937cabb-b929-4aac-87e9-38b81eb68cd9"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=userdelegationkey",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "90256190-13b6-4605-b8df-6c7077aad1bf",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cd210595-8ca0-4efd-b762-96cb629282a2",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e630b362-c01e-001b-0ed7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>169b7f41-9693-4ce8-968c-84bcc77a2a08</SignedOid><SignedTid>a0652a2b-201e-4f2e-9390-35274724b0c0</SignedTid><SignedStart>2021-05-05T17:50:58Z</SignedStart><SignedExpiry>2021-05-06T17:50:58Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-08-04</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
-      "x-ms-client-request-id" : "90256190-13b6-4605-b8df-6c7077aad1bf",
-      "Date" : "Wed, 05 May 2021 17:50:57 GMT",
+      "x-ms-request-id" : "4875319d-701e-0011-61ff-484076000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><UserDelegationKey><SignedOid>9242e904-f282-4c98-ab09-1e94105d5a0e</SignedOid><SignedTid>a97ce5b1-2a21-4e42-95f7-18a10218ddcd</SignedTid><SignedStart>2021-05-14T20:26:19Z</SignedStart><SignedExpiry>2021-05-15T20:26:17Z</SignedExpiry><SignedService>b</SignedService><SignedVersion>2020-10-02</SignedVersion><Value>UkVEQUNURUQ=</Value></UserDelegationKey>",
+      "x-ms-client-request-id" : "cd210595-8ca0-4efd-b762-96cb629282a2",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158172d58970045172c355a04d8ca6d?restype=container&comp=list&sv=2020-08-04&se=2021-05-06T17%3A50%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T17%3A50%3A58Z&ske=2021-05-06T17%3A50%3A58Z&sks=b&skv=2020-08-04&scid=invalidcid&sr=c&sp=l&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158181970281653815d3e4d54898a98?restype=container&comp=list&sv=2020-10-02&se=2021-05-15T20%3A26%3A17Z&skoid=c4f48289-bb84-4086-b250-6f94a8f64cee&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-14T20%3A26%3A19Z&ske=2021-05-15T20%3A26%3A17Z&sks=b&skv=2020-10-02&scid=invalidcid&sr=c&sp=l&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9bf01cf1-07ba-468a-ac70-35ff5fdb8718"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "104270c0-f997-49b5-95d1-c2cb5c723a8e"
     },
     "Response" : {
       "content-length" : "405",
@@ -81,52 +82,12 @@
       "x-ms-error-code" : "AuthenticationFailed",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "e630b392-c01e-001b-36d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:e630b392-c01e-001b-36d7-41f4b2000000\nTime:2021-05-05T17:50:58.5534048Z</Message><AuthenticationErrorDetail>Invalid correlation id format.</AuthenticationErrorDetail></Error>",
-      "Date" : "Wed, 05 May 2021 17:50:57 GMT",
+      "x-ms-request-id" : "487531d9-701e-0011-14ff-484076000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:487531d9-701e-0011-14ff-484076000000\nTime:2021-05-14T20:26:19.1655447Z</Message><AuthenticationErrorDetail>Invalid correlation id format.</AuthenticationErrorDetail></Error>",
+      "Date" : "Fri, 14 May 2021 20:26:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=47c31581",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "10e1607c-efa3-4d7d-ab8f-7d6cc9076814"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630b3c2-c01e-001b-61d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>47c31581</Prefix><Containers><Container><Name>47c31581047c3158172d58970045172c355a04d8ca6d</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:58 GMT</Last-Modified><Etag>\"0x8D90FEE56BCEDE1\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "10e1607c-efa3-4d7d-ab8f-7d6cc9076814",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/47c31581047c3158172d58970045172c355a04d8ca6d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3a5bf8ee-1811-4565-86c3-3f1e512da4d0"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630b3e0-c01e-001b-7cd7-41f4b2000000",
-      "x-ms-client-request-id" : "3a5bf8ee-1811-4565-86c3-3f1e512da4d0",
-      "Date" : "Wed, 05 May 2021 17:50:58 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "47c31581047c3158172d58970045172c355a04d8ca6d", "47c31581147c3158172d947502ef08df3bd794397a26", "2021-05-05T17:50:58.413139500Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
+  "variables" : [ "47c31581047c3158181970281653815d3e4d54898a98", "47c31581147c31581819392900a4fd55a68194047bdd", "2021-05-14T20:26:17.525686Z", "c4f48289-bb84-4086-b250-6f94a8f64cee", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[0].json
index f721b38b9fbf..2bbc15f5b42b 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[0].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[0].json
@@ -1,151 +1,156 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f858fd01157bf8c34edd47a42068ee?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6bfd8c76-c748-4a84-ba96-dbfd915f365e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6d71b949-411b-44ad-9132-1a3348e63968"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE47E3B1B4",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:33 GMT",
+      "eTag" : "0x8D9171724D38319",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:41 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e63081fe-c01e-001b-56d7-41f4b2000000",
-      "x-ms-client-request-id" : "6bfd8c76-c748-4a84-ba96-dbfd915f365e",
-      "Date" : "Wed, 05 May 2021 17:50:32 GMT"
+      "x-ms-request-id" : "a1f9d122-e01e-005e-6f00-493122000000",
+      "x-ms-client-request-id" : "6d71b949-411b-44ad-9132-1a3348e63968",
+      "Date" : "Fri, 14 May 2021 20:30:41 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "340677c0-4cad-48d8-8ca9-6450cf86ce7d",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7c586764-1434-4095-b7ff-5a6796848038",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e63082a2-c01e-001b-63d7-41f4b2000000",
-      "x-ms-client-request-id" : "340677c0-4cad-48d8-8ca9-6450cf86ce7d",
-      "Date" : "Wed, 05 May 2021 17:50:33 GMT"
+      "x-ms-request-id" : "a1f9d1e2-e01e-005e-0a00-493122000000",
+      "x-ms-client-request-id" : "7c586764-1434-4095-b7ff-5a6796848038",
+      "Date" : "Fri, 14 May 2021 20:30:41 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d?restype=container&comp=acl",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f858fd01157bf8c34edd47a42068ee?restype=container&comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3363a135-3392-4a8c-a336-02507e752791",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "eb98baee-a8dc-4cb9-9dfb-7f87dfed02d4",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE489865B6",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:34 GMT",
+      "eTag" : "0x8D917172531D6BA",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:42 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e6308402-c01e-001b-0cd7-41f4b2000000",
-      "x-ms-client-request-id" : "3363a135-3392-4a8c-a336-02507e752791",
-      "Date" : "Wed, 05 May 2021 17:50:33 GMT"
+      "x-ms-request-id" : "a1f9d213-e01e-005e-3200-493122000000",
+      "x-ms-client-request-id" : "eb98baee-a8dc-4cb9-9dfb-7f87dfed02d4",
+      "Date" : "Fri, 14 May 2021 20:30:41 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d/8bb30f8518bb30f854e1083006e930397b4e64043995",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f858fd01157bf8c34edd47a42068ee/8bb30f8518bb30f858fd5877661918476de9c437db2e",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f6334e55-5ba3-4126-97dd-c8f970e9fb58",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "78a81233-3096-4f54-aeab-36bfc85e3ce0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "Q7G6/s6+u/k=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:42 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:42.7563548Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:42 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
-      "eTag" : "0x8D90FEE48B8730F",
-      "x-ms-request-id" : "e6308453-c01e-001b-53d7-41f4b2000000",
-      "x-ms-client-request-id" : "f6334e55-5ba3-4126-97dd-c8f970e9fb58"
+      "eTag" : "0x8D917172553AE1C",
+      "x-ms-request-id" : "a1f9d264-e01e-005e-7e00-493122000000",
+      "x-ms-client-request-id" : "78a81233-3096-4f54-aeab-36bfc85e3ce0"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d/8bb30f8518bb30f854e1083006e930397b4e64043995?sv=2020-08-04&sig=REDACTED&si=id%20with%20spaces&sr=c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f858fd01157bf8c34edd47a42068ee/8bb30f8518bb30f858fd5877661918476de9c437db2e?sv=2020-10-02&sig=REDACTED&si=id%20with%20spaces&sr=c",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "11ab754f-8893-4d35-bb74-8f7c7df24768"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "45dd9bfd-7382-4baa-82c3-34ae136e8c97"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "4",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:34 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:30:42 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:42 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:42.7563548Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:42 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:34 GMT",
-      "eTag" : "0x8D90FEE48B8730F",
-      "x-ms-request-id" : "e630849a-c01e-001b-0ed7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:30:42 GMT",
+      "eTag" : "0x8D917172553AE1C",
+      "x-ms-request-id" : "a1f9d2c4-e01e-005e-5800-493122000000",
       "Body" : "dGVzdA==",
-      "x-ms-client-request-id" : "11ab754f-8893-4d35-bb74-8f7c7df24768",
+      "x-ms-client-request-id" : "45dd9bfd-7382-4baa-82c3-34ae136e8c97",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d/8bb30f8518bb30f854e1083006e930397b4e64043995?sv=2020-08-04&sig=REDACTED&si=id%20with%20spaces&sr=c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f858fd01157bf8c34edd47a42068ee/8bb30f8518bb30f858fd5877661918476de9c437db2e?sv=2020-10-02&sig=REDACTED&si=id%20with%20spaces&sr=c",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "26d41a17-196a-4ae6-bb31-8fead521c814"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e8e916a1-af8a-4498-a9fd-f7dc2028abe4"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "4",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:34 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:30:43 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:42 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:42.7563548Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:34 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:42 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:34 GMT",
-      "eTag" : "0x8D90FEE48B8730F",
-      "x-ms-request-id" : "e63084f0-c01e-001b-54d7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:30:42 GMT",
+      "eTag" : "0x8D917172553AE1C",
+      "x-ms-request-id" : "a1f9d313-e01e-005e-1d00-493122000000",
       "Body" : "dGVzdA==",
-      "x-ms-client-request-id" : "26d41a17-196a-4ae6-bb31-8fead521c814",
+      "x-ms-client-request-id" : "e8e916a1-af8a-4498-a9fd-f7dc2028abe4",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
@@ -153,62 +158,22 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "91876fe5-9f26-418c-b1e6-429baff442f4",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "158c3e74-3e41-4e94-a59a-4aa0b2964d7c",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e630851f-c01e-001b-7ed7-41f4b2000000",
-      "x-ms-client-request-id" : "91876fe5-9f26-418c-b1e6-429baff442f4",
-      "Date" : "Wed, 05 May 2021 17:50:34 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=8bb30f85",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "61ff6883-afeb-4d27-82b6-c6fd87d0b0da"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6308579-c01e-001b-4ad7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>8bb30f85</Prefix><Containers><Container><Name>8bb30f8508bb30f854e176667877dd1a0a98a4c7980d</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:34 GMT</Last-Modified><Etag>\"0x8D90FEE489865B6\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "61ff6883-afeb-4d27-82b6-c6fd87d0b0da",
-      "Date" : "Wed, 05 May 2021 17:50:34 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/8bb30f8508bb30f854e176667877dd1a0a98a4c7980d?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eb08fe50-8d71-45cf-b7f9-bb1612074f7b"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e63085cd-c01e-001b-08d7-41f4b2000000",
-      "x-ms-client-request-id" : "eb08fe50-8d71-45cf-b7f9-bb1612074f7b",
-      "Date" : "Wed, 05 May 2021 17:50:36 GMT"
+      "x-ms-request-id" : "a1f9d31c-e01e-005e-2300-493122000000",
+      "x-ms-client-request-id" : "158c3e74-3e41-4e94-a59a-4aa0b2964d7c",
+      "Date" : "Fri, 14 May 2021 20:30:42 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "8bb30f8508bb30f854e176667877dd1a0a98a4c7980d", "8bb30f8518bb30f854e1083006e930397b4e64043995", "2021-05-05T17:50:34.494305700Z" ]
+  "variables" : [ "8bb30f8508bb30f858fd01157bf8c34edd47a42068ee", "8bb30f8518bb30f858fd5877661918476de9c437db2e", "2021-05-14T20:30:42.526943100Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[1].json
index fdfa1c34572b..a84cd3660a65 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[1].json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ServiceAPITestSASSanitization[1].json
@@ -1,151 +1,156 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "22aa9eb9-77ec-4b58-b6c3-3bd80dc06982"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5e310467-55f0-4fad-b93e-7bc8793c4847"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4A7C621C",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:37 GMT",
+      "eTag" : "0x8D9171725E8F698",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:43 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e6308967-c01e-001b-76d7-41f4b2000000",
-      "x-ms-client-request-id" : "22aa9eb9-77ec-4b58-b6c3-3bd80dc06982",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
+      "x-ms-request-id" : "a1f9d39c-e01e-005e-1000-493122000000",
+      "x-ms-client-request-id" : "5e310467-55f0-4fad-b93e-7bc8793c4847",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "17cc094a-454d-449e-81f8-818fe3a3ef8e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2b8a64de-1699-4b6b-a6fd-878e86c89d48",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e6308995-c01e-001b-18d7-41f4b2000000",
-      "x-ms-client-request-id" : "17cc094a-454d-449e-81f8-818fe3a3ef8e",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
+      "x-ms-request-id" : "a1f9d3b4-e01e-005e-2500-493122000000",
+      "x-ms-client-request-id" : "2b8a64de-1699-4b6b-a6fd-878e86c89d48",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5?restype=container&comp=acl",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d?restype=container&comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "398982a8-9c7f-40c8-80a9-4bb255790cf5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d4f364c4-8b05-490a-ad8a-bf59e37df55e",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE4A94E027",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:37 GMT",
+      "eTag" : "0x8D9171725FEE90F",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:43 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "e63089b8-c01e-001b-37d7-41f4b2000000",
-      "x-ms-client-request-id" : "398982a8-9c7f-40c8-80a9-4bb255790cf5",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
+      "x-ms-request-id" : "a1f9d3cf-e01e-005e-3f00-493122000000",
+      "x-ms-client-request-id" : "d4f364c4-8b05-490a-ad8a-bf59e37df55e",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5/92a83ec4192a83ec4d0288777a66b02d84f944b948df",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d/92a83ec4192a83ec4e0d6775606fab691f2d44b3882a",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0440704f-a2ee-4680-a3e4-a68911709d7d",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b2d4508f-8181-461a-9fa5-33a2d5e46498",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "Q7G6/s6+u/k=",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:43 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:43.9582083Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
-      "eTag" : "0x8D90FEE4AA73052",
-      "x-ms-request-id" : "e63089dc-c01e-001b-54d7-41f4b2000000",
-      "x-ms-client-request-id" : "0440704f-a2ee-4680-a3e4-a68911709d7d"
+      "eTag" : "0x8D91717260B1183",
+      "x-ms-request-id" : "a1f9d3f2-e01e-005e-6000-493122000000",
+      "x-ms-client-request-id" : "b2d4508f-8181-461a-9fa5-33a2d5e46498"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5/92a83ec4192a83ec4d0288777a66b02d84f944b948df?sv=2020-08-04&sig=REDACTED&si=id%20with%20spaces&sr=c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d/92a83ec4192a83ec4e0d6775606fab691f2d44b3882a?sv=2020-10-02&sig=REDACTED&si=id%20with%20spaces&sr=c",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d1debb9a-fd09-429b-8426-510d3b5f4751"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d32eecf1-a9da-410b-a845-c321201141ee"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "4",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:37 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:30:43 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:43 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:43.9582083Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:37 GMT",
-      "eTag" : "0x8D90FEE4AA73052",
-      "x-ms-request-id" : "e6308a10-c01e-001b-80d7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:30:43 GMT",
+      "eTag" : "0x8D91717260B1183",
+      "x-ms-request-id" : "a1f9d40f-e01e-005e-7900-493122000000",
       "Body" : "dGVzdA==",
-      "x-ms-client-request-id" : "d1debb9a-fd09-429b-8426-510d3b5f4751",
+      "x-ms-client-request-id" : "d32eecf1-a9da-410b-a845-c321201141ee",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5/92a83ec4192a83ec4d0288777a66b02d84f944b948df?sv=2020-08-04&sig=REDACTED&si=id%20with%20spaces&sr=c",
+    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d/92a83ec4192a83ec4e0d6775606fab691f2d44b3882a?sv=2020-10-02&sig=REDACTED&si=id%20with%20spaces&sr=c",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "49f75fdb-cd53-4b18-a1a7-9ef843fcd09e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0139c554-a133-49e2-84e9-4cc018d939c7"
     },
     "Response" : {
+      "x-ms-is-current-version" : "true",
       "content-length" : "4",
-      "x-ms-last-access-time" : "Wed, 05 May 2021 17:50:37 GMT",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:30:44 GMT",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 20:30:43 GMT",
+      "x-ms-version-id" : "2021-05-14T20:30:43.9582083Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:50:37 GMT",
-      "eTag" : "0x8D90FEE4AA73052",
-      "x-ms-request-id" : "e6308a40-c01e-001b-2ad7-41f4b2000000",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:30:43 GMT",
+      "eTag" : "0x8D91717260B1183",
+      "x-ms-request-id" : "a1f9d44e-e01e-005e-2b00-493122000000",
       "Body" : "dGVzdA==",
-      "x-ms-client-request-id" : "49f75fdb-cd53-4b18-a1a7-9ef843fcd09e",
+      "x-ms-client-request-id" : "0139c554-a133-49e2-84e9-4cc018d939c7",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
@@ -153,62 +158,22 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e870b5d3-3f2b-4dfb-8ed3-e324274b6ddb",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a23997a7-d47d-49ab-b040-37391aed75ba",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "e6308a72-c01e-001b-54d7-41f4b2000000",
-      "x-ms-client-request-id" : "e870b5d3-3f2b-4dfb-8ed3-e324274b6ddb",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=92a83ec4",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9453f83e-2f7a-40b2-a497-ebdcd39b4a55"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e6308a9b-c01e-001b-74d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>92a83ec4</Prefix><Containers><Container><Name>92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5</Name><Properties><Last-Modified>Wed, 05 May 2021 17:50:37 GMT</Last-Modified><Etag>\"0x8D90FEE4A94E027\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9453f83e-2f7a-40b2-a497-ebdcd39b4a55",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "69f0e81e-2da3-4d71-a7b8-cce1202e97ac"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e6308ac9-c01e-001b-1ad7-41f4b2000000",
-      "x-ms-client-request-id" : "69f0e81e-2da3-4d71-a7b8-cce1202e97ac",
-      "Date" : "Wed, 05 May 2021 17:50:37 GMT"
+      "x-ms-request-id" : "a1f9d47f-e01e-005e-5500-493122000000",
+      "x-ms-client-request-id" : "a23997a7-d47d-49ab-b040-37391aed75ba",
+      "Date" : "Fri, 14 May 2021 20:30:43 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "92a83ec4092a83ec4d0286371dd5d1a2d77064edcba5", "92a83ec4192a83ec4d0288777a66b02d84f944b948df", "2021-05-05T17:50:37.860439100Z" ]
+  "variables" : [ "92a83ec4092a83ec4e0d38492dc46d9df4b7c470992d", "92a83ec4192a83ec4e0d6775606fab691f2d44b3882a", "2021-05-14T20:30:43.913216800Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingAccountSASToken.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingAccountSASToken.json
index 2a715eb07325..114c7d52bb80 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingAccountSASToken.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingAccountSASToken.json
@@ -1,228 +1,188 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f07fae1a8fbe433118a9f8edb528e04c338d7?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f07fae1a8f2fd95849c7e9dc972a614bcaaa4?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c4b067a0-92d3-4f3f-950b-e3989a76d294"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "079ef9c4-ba6f-4174-84f3-00ae4bf05833"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE617FE2EE",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:16 GMT",
+      "eTag" : "0x8D91717835461E4",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:20 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630d10f-c01e-001b-2ad7-41f4b2000000",
-      "x-ms-client-request-id" : "c4b067a0-92d3-4f3f-950b-e3989a76d294",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
+      "x-ms-request-id" : "8fc735b6-e01e-0013-0300-49fece000000",
+      "x-ms-client-request-id" : "079ef9c4-ba6f-4174-84f3-00ae4bf05833",
+      "Date" : "Fri, 14 May 2021 20:33:19 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "249d70a6-7e0f-4307-aa60-d8d80a8b519d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "78e0e7fc-922f-4e3a-971b-c82fcdbcdedb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE618C4F21",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:16 GMT",
+      "eTag" : "0x8D9171783749A09",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:20 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f729c2eb-c01e-0071-2fd7-419999000000",
-      "x-ms-client-request-id" : "249d70a6-7e0f-4307-aa60-d8d80a8b519d",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
+      "x-ms-request-id" : "8fc73616-e01e-0013-5a00-49fece000000",
+      "x-ms-client-request-id" : "78e0e7fc-922f-4e3a-971b-c82fcdbcdedb",
+      "Date" : "Fri, 14 May 2021 20:33:19 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d/7fae1a8f17fae1a8fbe47279924d976c6fed6453d993",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824/7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5e4bddc2-0cac-4766-b88f-8fc1b5e13804",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d8fd2992-831b-4796-bb86-ec5c5eea54bb",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "ywr9rMi7xR4=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:16 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:16.3686789Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:21 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:21.0198405Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT",
       "Content-MD5" : "YG5vQuFUmxmlD0AjZQJsiw==",
-      "eTag" : "0x8D90FEE61990385",
-      "x-ms-request-id" : "f729c2f7-c01e-0071-39d7-419999000000",
-      "x-ms-client-request-id" : "5e4bddc2-0cac-4766-b88f-8fc1b5e13804"
+      "eTag" : "0x8D9171783A89E68",
+      "x-ms-request-id" : "8fc736b1-e01e-0013-5f00-49fece000000",
+      "x-ms-client-request-id" : "d8fd2992-831b-4796-bb86-ec5c5eea54bb"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d/7fae1a8f17fae1a8fbe47279924d976c6fed6453d993",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824/7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2beabb2b-a7a3-4166-ab08-b28289285a3c",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e7aedf05-ed7c-48c7-888d-d02c14c9de2a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "QJGj/JCqdp8=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:16 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:16.4497349Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:21 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:21.1169083Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
-      "eTag" : "0x8D90FEE61A53AB5",
-      "x-ms-request-id" : "f729c305-c01e-0071-43d7-419999000000",
-      "x-ms-client-request-id" : "2beabb2b-a7a3-4166-ab08-b28289285a3c"
+      "eTag" : "0x8D9171783B76E2B",
+      "x-ms-request-id" : "8fc736f1-e01e-0013-1700-49fece000000",
+      "x-ms-client-request-id" : "e7aedf05-ed7c-48c7-888d-d02c14c9de2a"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d/7fae1a8f17fae1a8fbe47279924d976c6fed6453d993?versionid=2021-05-05T17%3A51%3A16.3686789Z&sv=2020-08-04&ss=b&srt=o&se=2021-05-06T17%3A51%3A16Z&sp=x&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824/7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b?versionid=2021-05-14T20%3A33%3A21.0198405Z&sv=2020-10-02&ss=b&srt=o&se=2021-05-15T20%3A33%3A21Z&sp=x&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8f565aff-fcfe-40d8-ac0b-a4d0475d2252"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3b3aa614-f0e4-486c-8733-ff433ea5b9ce"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-delete-type-permanent" : "false",
+      "x-ms-delete-type-permanent" : "true",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c311-c01e-0071-4ed7-419999000000",
-      "x-ms-client-request-id" : "8f565aff-fcfe-40d8-ac0b-a4d0475d2252",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
+      "x-ms-request-id" : "8fc7376b-e01e-0013-0500-49fece000000",
+      "x-ms-client-request-id" : "3b3aa614-f0e4-486c-8733-ff433ea5b9ce",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d/7fae1a8f17fae1a8fbe47279924d976c6fed6453d993?versionid=2021-05-05T17%3A51%3A16.3686789Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824/7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b?versionid=2021-05-14T20%3A33%3A21.0198405Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2541ff2d-ac23-40d9-aeb1-020083fd7052"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "111e147d-b116-48a2-a9a9-a9a14e5a1027"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-is-soft-deleted" : "true",
       "x-ms-error-code" : "BlobNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "f729c318-c01e-0071-55d7-419999000000",
-      "x-ms-client-request-id" : "2541ff2d-ac23-40d9-aeb1-020083fd7052",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
+      "x-ms-request-id" : "8fc737a1-e01e-0013-3900-49fece000000",
+      "x-ms-client-request-id" : "111e147d-b116-48a2-a9a9-a9a14e5a1027",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d/7fae1a8f17fae1a8fbe47279924d976c6fed6453d993?versionid=2021-05-05T17%3A51%3A16.4497349Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824/7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b?versionid=2021-05-14T20%3A33%3A21.1169083Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "01712de1-8061-4d65-8f67-09953f653b1e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4560e70e-3e59-4f12-b412-d22f74685bba"
     },
     "Response" : {
       "x-ms-is-current-version" : "true",
       "content-length" : "9",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:33:21 GMT",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:16 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:16.4497349Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:21 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:21.1169083Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:16 GMT",
-      "eTag" : "0x8D90FEE61A53AB5",
-      "x-ms-request-id" : "f729c323-c01e-0071-5ed7-419999000000",
-      "x-ms-client-request-id" : "01712de1-8061-4d65-8f67-09953f653b1e",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:33:21 GMT",
+      "eTag" : "0x8D9171783B76E2B",
+      "x-ms-request-id" : "8fc737c8-e01e-0013-5f00-49fece000000",
+      "x-ms-client-request-id" : "4560e70e-3e59-4f12-b412-d22f74685bba",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f27fae1a8f2fd3855771a335bb373547e2824?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e36a018d-b40e-4963-93c3-c3b424921eb2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fd561da5-8014-4719-998e-88b099e5aa61"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c337-c01e-0071-70d7-419999000000",
-      "x-ms-client-request-id" : "e36a018d-b40e-4963-93c3-c3b424921eb2",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=7fae1a8f",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9086b260-5fcb-4891-bb01-71dde677d042"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630d1fb-c01e-001b-01d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>7fae1a8f</Prefix><Containers><Container><Name>7fae1a8f07fae1a8fbe433118a9f8edb528e04c338d7</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:16 GMT</Last-Modified><Etag>\"0x8D90FEE617FE2EE\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9086b260-5fcb-4891-bb01-71dde677d042",
-      "Date" : "Wed, 05 May 2021 17:51:16 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fae1a8f07fae1a8fbe433118a9f8edb528e04c338d7?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0f2c5771-962a-4299-9a41-72cc58c316af"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630d210-c01e-001b-14d7-41f4b2000000",
-      "x-ms-client-request-id" : "0f2c5771-962a-4299-9a41-72cc58c316af",
-      "Date" : "Wed, 05 May 2021 17:51:18 GMT"
+      "x-ms-request-id" : "8fc737f3-e01e-0013-0700-49fece000000",
+      "x-ms-client-request-id" : "fd561da5-8014-4719-998e-88b099e5aa61",
+      "Date" : "Fri, 14 May 2021 20:33:20 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "7fae1a8f07fae1a8fbe433118a9f8edb528e04c338d7", "7fae1a8f17fae1a8fbe47279924d976c6fed6453d993", "7fae1a8f27fae1a8fbe461861e6cbb667be7d461298d", "2021-05-05T17:51:16.633068200Z" ]
+  "variables" : [ "7fae1a8f07fae1a8f2fd95849c7e9dc972a614bcaaa4", "7fae1a8f17fae1a8f2fd56281b302371d62c04503b2b", "7fae1a8f27fae1a8f2fd3855771a335bb373547e2824", "2021-05-14T20:33:21.232602900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingContainerSASToken.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingContainerSASToken.json
index 6b6b052bf8cd..aa041c80ca80 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingContainerSASToken.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingContainerSASToken.json
@@ -1,228 +1,188 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13026cd3b13863607914d98d309fcf649dfbd2?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13026cd3b13d88185437693d05788474695a64?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1d093583-5414-4829-97e2-7080a53c277b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9dc4004f-9ba1-476d-b4bc-63943ea82b3c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE61039741",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:15 GMT",
+      "eTag" : "0x8D917176596284A",
+      "Last-Modified" : "Fri, 14 May 2021 20:32:30 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630cfd6-c01e-001b-21d7-41f4b2000000",
-      "x-ms-client-request-id" : "1d093583-5414-4829-97e2-7080a53c277b",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT"
+      "x-ms-request-id" : "3bc4e705-e01e-0071-4100-493ce9000000",
+      "x-ms-client-request-id" : "9dc4004f-9ba1-476d-b4bc-63943ea82b3c",
+      "Date" : "Fri, 14 May 2021 20:32:30 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cbc5ceb2-b0c1-4c25-8968-6aa03a7f3cdc"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3ec9f400-17c4-47f6-9b40-18f31b225f78"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE61102AC2",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:15 GMT",
+      "eTag" : "0x8D9171765B8AAA7",
+      "Last-Modified" : "Fri, 14 May 2021 20:32:30 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f729c265-c01e-0071-35d7-419999000000",
-      "x-ms-client-request-id" : "cbc5ceb2-b0c1-4c25-8968-6aa03a7f3cdc",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT"
+      "x-ms-request-id" : "3bc4e724-e01e-0071-5700-493ce9000000",
+      "x-ms-client-request-id" : "3ec9f400-17c4-47f6-9b40-18f31b225f78",
+      "Date" : "Fri, 14 May 2021 20:32:30 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864/26cd3b13126cd3b1386351341570f258f093c4689b38",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1/26cd3b13126cd3b13d88611368a6e7c460c6c4a39872",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ccef8a6e-c0a3-4072-a274-4885133c106e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "dbf08762-baf6-4894-b0c9-f9928021d59b",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "ywr9rMi7xR4=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:15 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:15.5571065Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:32:31 GMT",
+      "x-ms-version-id" : "2021-05-14T20:32:31.1023607Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT",
+      "Date" : "Fri, 14 May 2021 20:32:30 GMT",
       "Content-MD5" : "YG5vQuFUmxmlD0AjZQJsiw==",
-      "eTag" : "0x8D90FEE611D0660",
-      "x-ms-request-id" : "f729c274-c01e-0071-43d7-419999000000",
-      "x-ms-client-request-id" : "ccef8a6e-c0a3-4072-a274-4885133c106e"
+      "eTag" : "0x8D9171765E7F7F7",
+      "x-ms-request-id" : "3bc4e756-e01e-0071-7d00-493ce9000000",
+      "x-ms-client-request-id" : "dbf08762-baf6-4894-b0c9-f9928021d59b"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864/26cd3b13126cd3b1386351341570f258f093c4689b38",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1/26cd3b13126cd3b13d88611368a6e7c460c6c4a39872",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7bf3eb09-7cf2-47ba-a36a-ad97f4565ed8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1cd4460a-2981-4aad-a201-842ab65f77c7",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "QJGj/JCqdp8=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:15 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:15.6371652Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:32:31 GMT",
+      "x-ms-version-id" : "2021-05-14T20:32:31.2504645Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT",
+      "Date" : "Fri, 14 May 2021 20:32:31 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
-      "eTag" : "0x8D90FEE61291680",
-      "x-ms-request-id" : "f729c281-c01e-0071-50d7-419999000000",
-      "x-ms-client-request-id" : "7bf3eb09-7cf2-47ba-a36a-ad97f4565ed8"
+      "eTag" : "0x8D9171765FE6A35",
+      "x-ms-request-id" : "3bc4e799-e01e-0071-3700-493ce9000000",
+      "x-ms-client-request-id" : "1cd4460a-2981-4aad-a201-842ab65f77c7"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864/26cd3b13126cd3b1386351341570f258f093c4689b38?versionid=2021-05-05T17%3A51%3A15.5571065Z&sv=2020-08-04&se=2021-05-06T17%3A51%3A15Z&sr=c&sp=x&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1/26cd3b13126cd3b13d88611368a6e7c460c6c4a39872?versionid=2021-05-14T20%3A32%3A31.1023607Z&sv=2020-10-02&se=2021-05-15T20%3A32%3A31Z&sr=c&sp=x&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f5a3529a-d1c3-4bac-beb3-768c4776e945"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0f5055b7-8cf9-4b54-8326-2d1b8cb4491a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-delete-type-permanent" : "false",
+      "x-ms-delete-type-permanent" : "true",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c28f-c01e-0071-5cd7-419999000000",
-      "x-ms-client-request-id" : "f5a3529a-d1c3-4bac-beb3-768c4776e945",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT"
+      "x-ms-request-id" : "3bc4e7cd-e01e-0071-6300-493ce9000000",
+      "x-ms-client-request-id" : "0f5055b7-8cf9-4b54-8326-2d1b8cb4491a",
+      "Date" : "Fri, 14 May 2021 20:32:31 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864/26cd3b13126cd3b1386351341570f258f093c4689b38?versionid=2021-05-05T17%3A51%3A15.5571065Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1/26cd3b13126cd3b13d88611368a6e7c460c6c4a39872?versionid=2021-05-14T20%3A32%3A31.1023607Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "49cd7096-2f77-4d95-bb6b-315f28f3ccce"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "805bf822-f50e-45ad-ba46-fbd0c93513ee"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-is-soft-deleted" : "true",
       "x-ms-error-code" : "BlobNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "f729c29e-c01e-0071-68d7-419999000000",
-      "x-ms-client-request-id" : "49cd7096-2f77-4d95-bb6b-315f28f3ccce",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT"
+      "x-ms-request-id" : "3bc4e7e5-e01e-0071-7400-493ce9000000",
+      "x-ms-client-request-id" : "805bf822-f50e-45ad-ba46-fbd0c93513ee",
+      "Date" : "Fri, 14 May 2021 20:32:31 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864/26cd3b13126cd3b1386351341570f258f093c4689b38?versionid=2021-05-05T17%3A51%3A15.6371652Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1/26cd3b13126cd3b13d88611368a6e7c460c6c4a39872?versionid=2021-05-14T20%3A32%3A31.2504645Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8fe670c0-324b-4608-8908-c4199f86f2c2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "25ec84c0-5a7c-49ad-8ca0-aa51b569a93e"
     },
     "Response" : {
       "x-ms-is-current-version" : "true",
       "content-length" : "9",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:32:31 GMT",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:15 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:15.6371652Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:32:31 GMT",
+      "x-ms-version-id" : "2021-05-14T20:32:31.2504645Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT",
+      "Date" : "Fri, 14 May 2021 20:32:31 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:15 GMT",
-      "eTag" : "0x8D90FEE61291680",
-      "x-ms-request-id" : "f729c2a9-c01e-0071-73d7-419999000000",
-      "x-ms-client-request-id" : "8fe670c0-324b-4608-8908-c4199f86f2c2",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:32:31 GMT",
+      "eTag" : "0x8D9171765FE6A35",
+      "x-ms-request-id" : "3bc4e7f3-e01e-0071-8000-493ce9000000",
+      "x-ms-client-request-id" : "25ec84c0-5a7c-49ad-8ca0-aa51b569a93e",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13863919788fc80d2e767f42d5864?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13226cd3b13d8816388e49def41f39748a89a1?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "36682a37-e0fd-4348-b7c9-d01b87b8de73"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d411386a-e57c-452b-a5ae-d705d6bc138a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c2b5-c01e-0071-7dd7-419999000000",
-      "x-ms-client-request-id" : "36682a37-e0fd-4348-b7c9-d01b87b8de73",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=26cd3b13",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "40936666-85f2-4577-bf67-0ab5540fcfb5"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630d0bf-c01e-001b-67d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>26cd3b13</Prefix><Containers><Container><Name>26cd3b13026cd3b13863607914d98d309fcf649dfbd2</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:15 GMT</Last-Modified><Etag>\"0x8D90FEE61039741\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "40936666-85f2-4577-bf67-0ab5540fcfb5",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/26cd3b13026cd3b13863607914d98d309fcf649dfbd2?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "21ec05e0-8f51-4196-a35d-e46e33db168a"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630d0e3-c01e-001b-05d7-41f4b2000000",
-      "x-ms-client-request-id" : "21ec05e0-8f51-4196-a35d-e46e33db168a",
-      "Date" : "Wed, 05 May 2021 17:51:15 GMT"
+      "x-ms-request-id" : "3bc4e811-e01e-0071-1900-493ce9000000",
+      "x-ms-client-request-id" : "d411386a-e57c-452b-a5ae-d705d6bc138a",
+      "Date" : "Fri, 14 May 2021 20:32:31 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "26cd3b13026cd3b13863607914d98d309fcf649dfbd2", "26cd3b13126cd3b1386351341570f258f093c4689b38", "26cd3b13226cd3b13863919788fc80d2e767f42d5864", "2021-05-05T17:51:15.819450200Z" ]
+  "variables" : [ "26cd3b13026cd3b13d88185437693d05788474695a64", "26cd3b13126cd3b13d88611368a6e7c460c6c4a39872", "26cd3b13226cd3b13d8816388e49def41f39748a89a1", "2021-05-14T20:32:31.380171200Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingSASToken.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingSASToken.json
index 2ec340fdffe1..f383c2fd847f 100644
--- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingSASToken.json
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/VersioningTestDeleteBlobByVersionUsingSASToken.json
@@ -1,228 +1,188 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5077c7fff5676661434ef56c9dc3bb434e820?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5077c7fff55d814820a633d1b6c3064b9babd?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6ee35777-7070-4c72-968c-9e885b1f700f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6486a925-ea4f-405b-9398-e72e0ad88f14"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5EF230D7",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:11 GMT",
+      "eTag" : "0x8D91717786D8E2B",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:02 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "e630caa4-c01e-001b-26d7-41f4b2000000",
-      "x-ms-client-request-id" : "6ee35777-7070-4c72-968c-9e885b1f700f",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
+      "x-ms-request-id" : "5e14b559-401e-0025-1a00-4973be000000",
+      "x-ms-client-request-id" : "6486a925-ea4f-405b-9398-e72e0ad88f14",
+      "Date" : "Fri, 14 May 2021 20:33:01 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d9d2ba50-2cae-4b8b-8cca-0884bef12ad3"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "be466bbc-da19-41aa-9f81-be714f0e527f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D90FEE5F3064EB",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:12 GMT",
+      "eTag" : "0x8D91717788E899C",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:02 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f729c019-c01e-0071-33d7-419999000000",
-      "x-ms-client-request-id" : "d9d2ba50-2cae-4b8b-8cca-0884bef12ad3",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
+      "x-ms-request-id" : "5e14b58c-401e-0025-4300-4973be000000",
+      "x-ms-client-request-id" : "be466bbc-da19-41aa-9f81-be714f0e527f",
+      "Date" : "Fri, 14 May 2021 20:33:01 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6/77c7fff5177c7fff567640107fc5651e3dee94081a36",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902/77c7fff5177c7fff55d875058edacb17f68d94f438c0",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1c000ec5-0256-4e4a-b14d-0d5baf669ec2",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8f2071b0-1eaf-46b7-b66f-9bf65c44b9fb",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "ywr9rMi7xR4=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:12 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:12.4118826Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:02 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:02.7498548Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT",
       "Content-MD5" : "YG5vQuFUmxmlD0AjZQJsiw==",
-      "eTag" : "0x8D90FEE5F3D412A",
-      "x-ms-request-id" : "f729c038-c01e-0071-47d7-419999000000",
-      "x-ms-client-request-id" : "1c000ec5-0256-4e4a-b14d-0d5baf669ec2"
+      "eTag" : "0x8D9171778C4FE34",
+      "x-ms-request-id" : "5e14b5c4-401e-0025-7400-4973be000000",
+      "x-ms-client-request-id" : "8f2071b0-1eaf-46b7-b66f-9bf65c44b9fb"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6/77c7fff5177c7fff567640107fc5651e3dee94081a36",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902/77c7fff5177c7fff55d875058edacb17f68d94f438c0",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b9d63939-4022-4b03-bb31-a37280983e5e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8a210f23-d949-4b0c-9e50-c458706a2146",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-content-crc64" : "QJGj/JCqdp8=",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:12 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:12.5139542Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:02 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:02.8449216Z",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
-      "eTag" : "0x8D90FEE5F4C8632",
-      "x-ms-request-id" : "f729c04e-c01e-0071-5bd7-419999000000",
-      "x-ms-client-request-id" : "b9d63939-4022-4b03-bb31-a37280983e5e"
+      "eTag" : "0x8D9171778D358B0",
+      "x-ms-request-id" : "5e14b5f2-401e-0025-1d00-4973be000000",
+      "x-ms-client-request-id" : "8a210f23-d949-4b0c-9e50-c458706a2146"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6/77c7fff5177c7fff567640107fc5651e3dee94081a36?versionid=2021-05-05T17%3A51%3A12.4118826Z&sv=2020-08-04&se=2021-05-06T17%3A51%3A12Z&sr=bv&sp=x&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902/77c7fff5177c7fff55d875058edacb17f68d94f438c0?versionid=2021-05-14T20%3A33%3A02.7498548Z&sv=2020-10-02&se=2021-05-15T20%3A33%3A02Z&sr=bv&sp=x&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ef4d275e-89d8-428e-9cee-cd53d3384ed1"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "726fd6cf-8470-498a-b0d9-e16683909d34"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-delete-type-permanent" : "false",
+      "x-ms-delete-type-permanent" : "true",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c067-c01e-0071-71d7-419999000000",
-      "x-ms-client-request-id" : "ef4d275e-89d8-428e-9cee-cd53d3384ed1",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
+      "x-ms-request-id" : "5e14b60a-401e-0025-2e00-4973be000000",
+      "x-ms-client-request-id" : "726fd6cf-8470-498a-b0d9-e16683909d34",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6/77c7fff5177c7fff567640107fc5651e3dee94081a36?versionid=2021-05-05T17%3A51%3A12.4118826Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902/77c7fff5177c7fff55d875058edacb17f68d94f438c0?versionid=2021-05-14T20%3A33%3A02.7498548Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "08ab923f-e298-48f1-9e12-36161707b262"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "63e573c1-6909-4376-8d13-ff60be4fc0b2"
     },
     "Response" : {
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-is-soft-deleted" : "true",
       "x-ms-error-code" : "BlobNotFound",
       "retry-after" : "0",
       "StatusCode" : "404",
-      "x-ms-request-id" : "f729c075-c01e-0071-7dd7-419999000000",
-      "x-ms-client-request-id" : "08ab923f-e298-48f1-9e12-36161707b262",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
+      "x-ms-request-id" : "5e14b617-401e-0025-3b00-4973be000000",
+      "x-ms-client-request-id" : "63e573c1-6909-4376-8d13-ff60be4fc0b2",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6/77c7fff5177c7fff567640107fc5651e3dee94081a36?versionid=2021-05-05T17%3A51%3A12.5139542Z",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902/77c7fff5177c7fff55d875058edacb17f68d94f438c0?versionid=2021-05-14T20%3A33%3A02.8449216Z",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "65a5992b-95d8-4280-8d8f-16d1f7eedfea"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cd8afd43-7363-4a46-8be7-19b79a54fe27"
     },
     "Response" : {
       "x-ms-is-current-version" : "true",
       "content-length" : "9",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-last-access-time" : "Fri, 14 May 2021 20:33:02 GMT",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "Last-Modified" : "Wed, 05 May 2021 17:51:12 GMT",
-      "x-ms-version-id" : "2021-05-05T17:51:12.5139542Z",
+      "Last-Modified" : "Fri, 14 May 2021 20:33:02 GMT",
+      "x-ms-version-id" : "2021-05-14T20:33:02.8449216Z",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT",
       "Content-MD5" : "kmALmZ1m8z4vpHwTIxFP4g==",
       "x-ms-blob-type" : "BlockBlob",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-access-tier-inferred" : "true",
       "x-ms-access-tier" : "Hot",
-      "x-ms-creation-time" : "Wed, 05 May 2021 17:51:12 GMT",
-      "eTag" : "0x8D90FEE5F4C8632",
-      "x-ms-request-id" : "f729c083-c01e-0071-0bd7-419999000000",
-      "x-ms-client-request-id" : "65a5992b-95d8-4280-8d8f-16d1f7eedfea",
+      "x-ms-creation-time" : "Fri, 14 May 2021 20:33:02 GMT",
+      "eTag" : "0x8D9171778D358B0",
+      "x-ms-request-id" : "5e14b635-401e-0025-4f00-4973be000000",
+      "x-ms-client-request-id" : "cd8afd43-7363-4a46-8be7-19b79a54fe27",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6?restype=container",
+    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5277c7fff55d85918139f7c9ba3b384d81902?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3f132921-0871-4e78-97b7-f15e4b8f4ea7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "15e0831a-d1de-4049-8117-03f5d8515213"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "f729c097-c01e-0071-1dd7-419999000000",
-      "x-ms-client-request-id" : "3f132921-0871-4e78-97b7-f15e4b8f4ea7",
-      "Date" : "Wed, 05 May 2021 17:51:11 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=77c7fff5",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c03bb957-41e7-4896-8c3f-fd4603489686"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e630cc20-c01e-001b-68d7-41f4b2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.blob.core.windows.net/\"><Prefix>77c7fff5</Prefix><Containers><Container><Name>77c7fff5077c7fff5676661434ef56c9dc3bb434e820</Name><Properties><Last-Modified>Wed, 05 May 2021 17:51:11 GMT</Last-Modified><Etag>\"0x8D90FEE5EF230D7\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c03bb957-41e7-4896-8c3f-fd4603489686",
-      "Date" : "Wed, 05 May 2021 17:51:12 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.blob.core.windows.net/77c7fff5077c7fff5676661434ef56c9dc3bb434e820?restype=container",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "da676625-9eba-444b-af4f-0ce2515ac3fb"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "e630cc3c-c01e-001b-01d7-41f4b2000000",
-      "x-ms-client-request-id" : "da676625-9eba-444b-af4f-0ce2515ac3fb",
-      "Date" : "Wed, 05 May 2021 17:51:14 GMT"
+      "x-ms-request-id" : "5e14b650-401e-0025-6700-4973be000000",
+      "x-ms-client-request-id" : "15e0831a-d1de-4049-8117-03f5d8515213",
+      "Date" : "Fri, 14 May 2021 20:33:02 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "77c7fff5077c7fff5676661434ef56c9dc3bb434e820", "77c7fff5177c7fff567640107fc5651e3dee94081a36", "77c7fff5277c7fff567698294b5b5a165e0fc4e95bf6", "2021-05-05T17:51:12.704586700Z" ]
+  "variables" : [ "77c7fff5077c7fff55d814820a633d1b6c3064b9babd", "77c7fff5177c7fff55d875058edacb17f68d94f438c0", "77c7fff5277c7fff55d85918139f7c9ba3b384d81902", "2021-05-14T20:33:02.975284Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
index 51a427ee64bc..ba1f0b472c74 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
@@ -198,7 +198,7 @@ public static final class HeaderConstants {
         /**
          * The current storage version header value.
          */
-        public static final String TARGET_STORAGE_VERSION = "2020-08-04";
+        public static final String TARGET_STORAGE_VERSION = "2020-10-02";
 
         /**
          * Error code returned from the service.
diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
index 2be8d536b71a..5f7d2afa045f 100644
--- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.6.0-beta.2 (Unreleased)
-
+- Added support for the 2020-10-02 service version.
 
 ## 12.6.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
index b3cf12fa7c15..4152f1c501c1 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
@@ -15,7 +15,8 @@ public enum DataLakeServiceVersion implements ServiceVersion {
     V2020_02_10("2020-02-10"),
     V2020_04_08("2020-04-08"),
     V2020_06_12("2020-06-12"),
-    V2020_08_04("2020-08-04");
+    V2020_08_04("2020-08-04"),
+    V2020_10_02("2020-10-02");
 
     private final String version;
 
@@ -37,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link DataLakeServiceVersion}
      */
     public static DataLakeServiceVersion getLatest() {
-        return V2020_08_04;
+        return V2020_10_02;
     }
 }
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java
index b44f63655337..3b024af5c2d5 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java
@@ -26,6 +26,8 @@ public static BlobServiceVersion toBlobServiceVersion(DataLakeServiceVersion ver
             return BlobServiceVersion.V2020_06_12;
         } else if (DataLakeServiceVersion.V2020_08_04.ordinal() == version.ordinal()) {
             return BlobServiceVersion.V2020_08_04;
+        } else if (DataLakeServiceVersion.V2020_10_02.ordinal() == version.ordinal()) {
+            return BlobServiceVersion.V2020_10_02;
         }
         return null;
     }
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailure.json
index 531e635498c0..2f36229da034 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailure.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/6fee15e906fee15e9aef2018545ad4b3d2478482aac1/6fee15e926fee15e9aef80119ee92ed5eea46459ca92?action=setAccessControlRecursive&mode=remove&forceFlag=true&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=ec81d240-5532-4901-a15e-23aa693040dd&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/6fee15e906fee15e9aef2018545ad4b3d2478482aac1/6fee15e926fee15e9aef80119ee92ed5eea46459ca92?action=setAccessControlRecursive&mode=remove&forceFlag=true&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=ec81d240-5532-4901-a15e-23aa693040dd&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -502,4 +502,4 @@
     "Exception" : null
   } ],
   "variables" : [ "6fee15e906fee15e9aef2018545ad4b3d2478482aac1", "6fee15e916fee15e9aef91883219d4a1bfa53428e838", "6fee15e926fee15e9aef80119ee92ed5eea46459ca92", "6fee15e936fee15e9aef289520dc454161df24b1589b", "6fee15e946fee15e9aef268605b78224e13fa44c48a1", "6fee15e956fee15e9aef0835483e707d63cf647ea88b", "6fee15e966fee15e9aef0161109f8e68161f04e7097b", "6fee15e976fee15e9aef457817ac0b1e3e9d74e0cb0f", "ec81d240-5532-4901-a15e-23aa693040dd", "6fee15e986fee15e9aef1164600702c694dac4b07bdc", "6fee15e996fee15e9aef77859196a575aa247495f916", "6fee15e9106fee15e9aef5180819b7cae4c77946d691", "6fee15e9116fee15e9aef77550ebf51bbb82d8461fb4", "2021-05-05T18:00:56.750145900Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.944143400Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchFailures.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchFailures.json
index 725c3ac92626..a7126754191d 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchFailures.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchFailures.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -463,7 +463,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbni%2B6U7bGaxNUBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS83MWMyNWNiYjA3MWMyNWNiYjdmYjcwNTkzOTM3ZGU5MjIzNzhiNGI3YmI3NAEwMUQ3NDFEODk2RTRCMkM0LzcxYzI1Y2JiMjcxYzI1Y2JiN2ZiMTgwNzNhYWVlOTBjMGFjNmY0NjU5OTI5LzcxYzI1Y2JiMzcxYzI1Y2JiN2ZiOTUxMjBlNzM2M2U1ZDMxYjU0OTlmYTdmLzcxYzI1Y2JiNDcxYzI1Y2JiN2ZiMTIwNzg5NDQxODMwZjYwYzM0YjFiODk5FgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbni%2B6U7bGaxNUBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS83MWMyNWNiYjA3MWMyNWNiYjdmYjcwNTkzOTM3ZGU5MjIzNzhiNGI3YmI3NAEwMUQ3NDFEODk2RTRCMkM0LzcxYzI1Y2JiMjcxYzI1Y2JiN2ZiMTgwNzNhYWVlOTBjMGFjNmY0NjU5OTI5LzcxYzI1Y2JiMzcxYzI1Y2JiN2ZiOTUxMjBlNzM2M2U1ZDMxYjU0OTlmYTdmLzcxYzI1Y2JiNDcxYzI1Y2JiN2ZiMTIwNzg5NDQxODMwZjYwYzM0YjFiODk5FgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -486,7 +486,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbz3%2BavqbTNzRsYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzcxYzI1Y2JiMDcxYzI1Y2JiN2ZiNzA1OTM5MzdkZTkyMjM3OGI0YjdiYjc0ATAxRDc0MUQ4OTZFNEIyQzQvNzFjMjVjYmIyNzFjMjVjYmI3ZmIxODA3M2FhZWU5MGMwYWM2ZjQ2NTk5MjkvNzFjMjVjYmI2NzFjMjVjYmI3ZmIwMjI0MzY3M2YzODdkZDQ5ZjQwYzA4NzYWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbz3%2BavqbTNzRsYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzcxYzI1Y2JiMDcxYzI1Y2JiN2ZiNzA1OTM5MzdkZTkyMjM3OGI0YjdiYjc0ATAxRDc0MUQ4OTZFNEIyQzQvNzFjMjVjYmIyNzFjMjVjYmI3ZmIxODA3M2FhZWU5MGMwYWM2ZjQ2NTk5MjkvNzFjMjVjYmI2NzFjMjVjYmI3ZmIwMjI0MzY3M2YzODdkZDQ5ZjQwYzA4NzYWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -509,7 +509,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBaY4sLNz7mElgwY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzcxYzI1Y2JiMDcxYzI1Y2JiN2ZiNzA1OTM5MzdkZTkyMjM3OGI0YjdiYjc0ATAxRDc0MUQ4OTZFNEIyQzQvNzFjMjVjYmIyNzFjMjVjYmI3ZmIxODA3M2FhZWU5MGMwYWM2ZjQ2NTk5MjkvNzFjMjVjYmI2NzFjMjVjYmI3ZmIwMjI0MzY3M2YzODdkZDQ5ZjQwYzA4NzYvNzFjMjVjYmIxMTcxYzI1Y2JiN2ZiNjYwMTEyOTlhMjE2NGQ1YWU0ZmNkOWEWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBaY4sLNz7mElgwY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzcxYzI1Y2JiMDcxYzI1Y2JiN2ZiNzA1OTM5MzdkZTkyMjM3OGI0YjdiYjc0ATAxRDc0MUQ4OTZFNEIyQzQvNzFjMjVjYmIyNzFjMjVjYmI3ZmIxODA3M2FhZWU5MGMwYWM2ZjQ2NTk5MjkvNzFjMjVjYmI2NzFjMjVjYmI3ZmIwMjI0MzY3M2YzODdkZDQ5ZjQwYzA4NzYvNzFjMjVjYmIxMTcxYzI1Y2JiN2ZiNjYwMTEyOTlhMjE2NGQ1YWU0ZmNkOWEWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -532,7 +532,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbBq4y93I6%2B1YABGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS83MWMyNWNiYjA3MWMyNWNiYjdmYjcwNTkzOTM3ZGU5MjIzNzhiNGI3YmI3NAEwMUQ3NDFEODk2RTRCMkM0LzcxYzI1Y2JiMjcxYzI1Y2JiN2ZiMTgwNzNhYWVlOTBjMGFjNmY0NjU5OTI5LzcxYzI1Y2JiNjcxYzI1Y2JiN2ZiMDIyNDM2NzNmMzg3ZGQ0OWY0MGMwODc2LzcxYzI1Y2JiODcxYzI1Y2JiN2ZiMDgxOTYzNjNiYjlkNDIxYjE0NjJmODAyFgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71c25cbb071c25cbb7fb70593937de922378b4b7bb74/71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929?action=setAccessControlRecursive&continuation=VBbBq4y93I6%2B1YABGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS83MWMyNWNiYjA3MWMyNWNiYjdmYjcwNTkzOTM3ZGU5MjIzNzhiNGI3YmI3NAEwMUQ3NDFEODk2RTRCMkM0LzcxYzI1Y2JiMjcxYzI1Y2JiN2ZiMTgwNzNhYWVlOTBjMGFjNmY0NjU5OTI5LzcxYzI1Y2JiNjcxYzI1Y2JiN2ZiMDIyNDM2NzNmMzg3ZGQ0OWY0MGMwODc2LzcxYzI1Y2JiODcxYzI1Y2JiN2ZiMDgxOTYzNjNiYjlkNDIxYjE0NjJmODAyFgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=4727c5b4-2b93-42a2-ae0f-a3207a74b1c2&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -594,4 +594,4 @@
     "Exception" : null
   } ],
   "variables" : [ "71c25cbb071c25cbb7fb70593937de922378b4b7bb74", "71c25cbb171c25cbb7fb4194731f443bd6ca14b199ab", "71c25cbb271c25cbb7fb18073aaee90c0ac6f4659929", "71c25cbb371c25cbb7fb95120e7363e5d31b5499fa7f", "71c25cbb471c25cbb7fb120789441830f60c34b1b899", "71c25cbb571c25cbb7fb61080f886e0c0525749e9846", "71c25cbb671c25cbb7fb02243673f387dd49f40c0876", "71c25cbb771c25cbb7fb81755c7d3dcc24b9841f5909", "4727c5b4-2b93-42a2-ae0f-a3207a74b1c2", "71c25cbb871c25cbb7fb08196363bb9d421b1462f802", "71c25cbb971c25cbb7fb3700442ad11692f5a4466b14", "71c25cbb1071c25cbb7fb74672f01b672e557d4bdf96", "71c25cbb1171c25cbb7fb66011299a2164d5ae4fcd9a", "2021-05-05T18:00:56.714629500Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.911145Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchesResume.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchesResume.json
index 86ff476a9899..0701de98a8e3 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchesResume.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveContinueOnFailureBatchesResume.json
@@ -616,7 +616,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -639,7 +639,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBbN5ZOKoPnb0ykY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjYxNDg5ZmU1N2Y2MDU1Mjg3NjlkMzRiYzMyZmEwNjQ0NWNkOTkvODlmZTU3ZjYxNTg5ZmU1N2Y2MDU1NzMwODI1MmM2M2ZkY2Q2NWU0N2ZjYWMWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBbN5ZOKoPnb0ykY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjYxNDg5ZmU1N2Y2MDU1Mjg3NjlkMzRiYzMyZmEwNjQ0NWNkOTkvODlmZTU3ZjYxNTg5ZmU1N2Y2MDU1NzMwODI1MmM2M2ZkY2Q2NWU0N2ZjYWMWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -662,7 +662,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBakn4Ke4pfrm3sY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjYzODlmZTU3ZjYwNTU1NzA4MmQ0MGE1N2M4YmQ1YTQzY2I5YzQvODlmZTU3ZjYxMjg5ZmU1N2Y2MDU1ODM0OTU1MjRmZTAyYTYwOWU0Y2FiOWYWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBakn4Ke4pfrm3sY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjYzODlmZTU3ZjYwNTU1NzA4MmQ0MGE1N2M4YmQ1YTQzY2I5YzQvODlmZTU3ZjYxMjg5ZmU1N2Y2MDU1ODM0OTU1MjRmZTAyYTYwOWU0Y2FiOWYWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -685,7 +685,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaM9aiL%2BMzRt%2BcBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS84OWZlNTdmNjA4OWZlNTdmNjA1NTU5OTExNzliNjA3OGU4ZGYwNDhiZGIyNgEwMUQ3NDFEODk2RjVGM0VBLzg5ZmU1N2Y2Mjg5ZmU1N2Y2MDU1MTU4NzhlNGIzYWIzNTFlNjg0MTU1YjkyLzg5ZmU1N2Y2Mzg5ZmU1N2Y2MDU1NTcwODJkNDBhNTdjOGJkNWE0M2NiOWM0Lzg5ZmU1N2Y2NDg5ZmU1N2Y2MDU1MDk3ODQwYTkxZjEwM2Q1ZDg0OTVjOTY5FgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaM9aiL%2BMzRt%2BcBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS84OWZlNTdmNjA4OWZlNTdmNjA1NTU5OTExNzliNjA3OGU4ZGYwNDhiZGIyNgEwMUQ3NDFEODk2RjVGM0VBLzg5ZmU1N2Y2Mjg5ZmU1N2Y2MDU1MTU4NzhlNGIzYWIzNTFlNjg0MTU1YjkyLzg5ZmU1N2Y2Mzg5ZmU1N2Y2MDU1NTcwODJkNDBhNTdjOGJkNWE0M2NiOWM0Lzg5ZmU1N2Y2NDg5ZmU1N2Y2MDU1MDk3ODQwYTkxZjEwM2Q1ZDg0OTVjOTY5FgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -708,7 +708,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaFodn/h8XM2hYYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjY2ODlmZTU3ZjYwNTU0Mjg2MjlhY2ViNjRjMjA0MDRhNDg4OWIWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaFodn/h8XM2hYYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjY2ODlmZTU3ZjYwNTU0Mjg2MjlhY2ViNjRjMjA0MDRhNDg4OWIWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -731,7 +731,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBb/2eja5/uW65oBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS84OWZlNTdmNjA4OWZlNTdmNjA1NTU5OTExNzliNjA3OGU4ZGYwNDhiZGIyNgEwMUQ3NDFEODk2RjVGM0VBLzg5ZmU1N2Y2Mjg5ZmU1N2Y2MDU1MTU4NzhlNGIzYWIzNTFlNjg0MTU1YjkyLzg5ZmU1N2Y2Njg5ZmU1N2Y2MDU1NDI4NjI5YWNlYjY0YzIwNDA0YTQ4ODliLzg5ZmU1N2Y2MTE4OWZlNTdmNjA1NTQ4OTg0YmM2NzkyNGJiODIzNDBkOTgxFgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBb/2eja5/uW65oBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS84OWZlNTdmNjA4OWZlNTdmNjA1NTU5OTExNzliNjA3OGU4ZGYwNDhiZGIyNgEwMUQ3NDFEODk2RjVGM0VBLzg5ZmU1N2Y2Mjg5ZmU1N2Y2MDU1MTU4NzhlNGIzYWIzNTFlNjg0MTU1YjkyLzg5ZmU1N2Y2Njg5ZmU1N2Y2MDU1NDI4NjI5YWNlYjY0YzIwNDA0YTQ4ODliLzg5ZmU1N2Y2MTE4OWZlNTdmNjA1NTQ4OTg0YmM2NzkyNGJiODIzNDBkOTgxFgAAAA%3D%3D&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -754,7 +754,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaQpLDSiKe8qDYY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjY2ODlmZTU3ZjYwNTU0Mjg2MjlhY2ViNjRjMjA0MDRhNDg4OWIvODlmZTU3ZjY4ODlmZTU3ZjYwNTUxMzc1Nzg5NzU2OTAxYTczNjQ3M2FhYTgWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/89fe57f6089fe57f60555991179b6078e8df048bdb26/89fe57f6289fe57f605515878e4b3ab351e684155b92?action=setAccessControlRecursive&continuation=VBaQpLDSiKe8qDYY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1Lzg5ZmU1N2Y2MDg5ZmU1N2Y2MDU1NTk5MTE3OWI2MDc4ZThkZjA0OGJkYjI2ATAxRDc0MUQ4OTZGNUYzRUEvODlmZTU3ZjYyODlmZTU3ZjYwNTUxNTg3OGU0YjNhYjM1MWU2ODQxNTViOTIvODlmZTU3ZjY2ODlmZTU3ZjYwNTU0Mjg2MjlhY2ViNjRjMjA0MDRhNDg4OWIvODlmZTU3ZjY4ODlmZTU3ZjYwNTUxMzc1Nzg5NzU2OTAxYTczNjQ3M2FhYTgWAAAA&mode=remove&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A58Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -816,4 +816,4 @@
     "Exception" : null
   } ],
   "variables" : [ "89fe57f6089fe57f60555991179b6078e8df048bdb26", "89fe57f6189fe57f6055115626dbc630fed014d51955", "89fe57f6289fe57f605515878e4b3ab351e684155b92", "89fe57f6389fe57f605557082d40a57c8bd5a43cb9c4", "89fe57f6489fe57f6055097840a91f103d5d8495c969", "89fe57f6589fe57f6055183748df83da748a24d7a93d", "89fe57f6689fe57f6055428629aceb64c20404a4889b", "89fe57f6789fe57f6055132777e59bdb23254417d827", "5734dd49-c4f0-4f4e-9ec0-557ab96c7ba3", "89fe57f6889fe57f60551375789756901a736473aaa8", "89fe57f6989fe57f6055772980013586a046e4209935", "89fe57f61089fe57f605500376eaf448bdac734279b3", "89fe57f61189fe57f605548984bc67924bb82340d981", "89fe57f61289fe57f605583495524fe02a609e4cab9f", "89fe57f61389fe57f605526731fe5ec55efddd4e9a9b", "89fe57f61489fe57f605528769d34bc32fa06445cd99", "89fe57f61589fe57f60557308252c63fdcd65e47fcac", "2021-05-05T18:00:57.841678500Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:58.050438500Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveProgressWithFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveProgressWithFailure.json
index b80a0eae7093..406b0b5fbc66 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveProgressWithFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestRemoveACLRecursiveProgressWithFailure.json
@@ -374,7 +374,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/55a8cb62055a8cb627ed66699c83541aff75547a7b25/55a8cb62255a8cb627ed79042d674e35bc84c4be5a02?action=setAccessControlRecursive&mode=remove&forceFlag=false&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=2dec70e3-0970-407d-9687-663858248625&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/55a8cb62055a8cb627ed66699c83541aff75547a7b25/55a8cb62255a8cb627ed79042d674e35bc84c4be5a02?action=setAccessControlRecursive&mode=remove&forceFlag=false&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=2dec70e3-0970-407d-9687-663858248625&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -436,4 +436,4 @@
     "Exception" : null
   } ],
   "variables" : [ "55a8cb62055a8cb627ed66699c83541aff75547a7b25", "55a8cb62155a8cb627ed7576497de1e7c15e54153b25", "55a8cb62255a8cb627ed79042d674e35bc84c4be5a02", "55a8cb62355a8cb627ed850945f396ef9c5444497bf6", "55a8cb62455a8cb627ed63383de7e007208ff43eea4a", "55a8cb62555a8cb627ed6800370d8f2d5ab9b4ea4937", "55a8cb62655a8cb627ed804633b26d46e116a43b8a17", "55a8cb62755a8cb627ed03775583f486997d543f89eb", "2dec70e3-0970-407d-9687-663858248625", "55a8cb62855a8cb627ed45213b4aed1b4eaba4c59bc0", "2021-05-05T18:00:56.484635400Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.722625500Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailure.json
index 7d894d813c56..b94807b88f5f 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailure.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/87bc6ec8087bc6ec8b25157667bc72bbb9a384aad809/87bc6ec8287bc6ec8b2532950e3a61bc8597442ad84b?action=setAccessControlRecursive&mode=set&forceFlag=true&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=86948892-f90b-4e14-91ff-81d06f5327c9&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/87bc6ec8087bc6ec8b25157667bc72bbb9a384aad809/87bc6ec8287bc6ec8b2532950e3a61bc8597442ad84b?action=setAccessControlRecursive&mode=set&forceFlag=true&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=86948892-f90b-4e14-91ff-81d06f5327c9&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -502,4 +502,4 @@
     "Exception" : null
   } ],
   "variables" : [ "87bc6ec8087bc6ec8b25157667bc72bbb9a384aad809", "87bc6ec8187bc6ec8b25813864616beeedd8e48c2b76", "87bc6ec8287bc6ec8b2532950e3a61bc8597442ad84b", "87bc6ec8387bc6ec8b25125226efd2b984ff44bcab49", "87bc6ec8487bc6ec8b2502019269b52b0eb27424ea68", "87bc6ec8587bc6ec8b250185143375ef246e84f53a61", "87bc6ec8687bc6ec8b257017224903a894a3d42f9ae1", "87bc6ec8787bc6ec8b25762479d7730ad67a14115bd9", "86948892-f90b-4e14-91ff-81d06f5327c9", "87bc6ec8887bc6ec8b2533483de80432cf6244f13b0c", "87bc6ec8987bc6ec8b2575339367f9c64dbe14aefbfa", "87bc6ec81087bc6ec8b2536780ad38bc4e9a784183a2", "87bc6ec81187bc6ec8b2584836b74b34fa4aa3463aa8", "2021-05-05T18:00:56.810145Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:57.056469900Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchFailures.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchFailures.json
index 0c91fb6d7630..1e4543ca1318 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchFailures.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchFailures.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -463,7 +463,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBaWotCvz/Kn5HMY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTEzNGUxNWMyNTEyNWM2MzEwMDRiZjI4MzY3YjUxNTQ5N2NiOTMvNGUxNWMyNTE0NGUxNWMyNTEyNWM3ODI4N2UwNTM0MzgzYTY5ZjQzZjBhY2MWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBaWotCvz/Kn5HMY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTEzNGUxNWMyNTEyNWM2MzEwMDRiZjI4MzY3YjUxNTQ5N2NiOTMvNGUxNWMyNTE0NGUxNWMyNTEyNWM3ODI4N2UwNTM0MzgzYTY5ZjQzZjBhY2MWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -486,7 +486,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBad3aGGjYSox5gBGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS80ZTE1YzI1MTA0ZTE1YzI1MTI1YzU5MTE1NWI0MTc4MWQ0NDZmNDM1MWEyZQEwMUQ3NDFEODk2RTYzOUEyLzRlMTVjMjUxMjRlMTVjMjUxMjVjNzU5NzhkMzE0YTI2YmUwYzk0Mjc4YTQwLzRlMTVjMjUxNjRlMTVjMjUxMjVjMTEzOTBiNjAxZjZkZDE3MGM0MGJjOTM3FgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBad3aGGjYSox5gBGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS80ZTE1YzI1MTA0ZTE1YzI1MTI1YzU5MTE1NWI0MTc4MWQ0NDZmNDM1MWEyZQEwMUQ3NDFEODk2RTYzOUEyLzRlMTVjMjUxMjRlMTVjMjUxMjVjNzU5NzhkMzE0YTI2YmUwYzk0Mjc4YTQwLzRlMTVjMjUxNjRlMTVjMjUxMjVjMTEzOTBiNjAxZjZkZDE3MGM0MGJjOTM3FgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -509,7 +509,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBaPnuPS/Lisw04Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTE2NGUxNWMyNTEyNWMxMTM5MGI2MDFmNmRkMTcwYzQwYmM5MzcvNGUxNWMyNTExMTRlMTVjMjUxMjVjNzY1NzYyYmMwM2E0MTdhOGQ0OTM5OTcWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBaPnuPS/Lisw04Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTE2NGUxNWMyNTEyNWMxMTM5MGI2MDFmNmRkMTcwYzQwYmM5MzcvNGUxNWMyNTExMTRlMTVjMjUxMjVjNzY1NzYyYmMwM2E0MTdhOGQ0OTM5OTcWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -532,7 +532,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBbi7JPUvaaQ2hwY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTE2NGUxNWMyNTEyNWMxMTM5MGI2MDFmNmRkMTcwYzQwYmM5MzcvNGUxNWMyNTE4NGUxNWMyNTEyNWM1MjY4NDVhMDFmZmU5MTdmNDRlNDVhZjEWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/4e15c25104e15c25125c591155b41781d446f4351a2e/4e15c25124e15c25125c75978d314a26be0c94278a40?action=setAccessControlRecursive&continuation=VBbi7JPUvaaQ2hwY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzRlMTVjMjUxMDRlMTVjMjUxMjVjNTkxMTU1YjQxNzgxZDQ0NmY0MzUxYTJlATAxRDc0MUQ4OTZFNjM5QTIvNGUxNWMyNTEyNGUxNWMyNTEyNWM3NTk3OGQzMTRhMjZiZTBjOTQyNzhhNDAvNGUxNWMyNTE2NGUxNWMyNTEyNWMxMTM5MGI2MDFmNmRkMTcwYzQwYmM5MzcvNGUxNWMyNTE4NGUxNWMyNTEyNWM1MjY4NDVhMDFmZmU5MTdmNDRlNDVhZjEWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=b64baf11-c24c-481e-982c-4bdcd243385f&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -594,4 +594,4 @@
     "Exception" : null
   } ],
   "variables" : [ "4e15c25104e15c25125c591155b41781d446f4351a2e", "4e15c25114e15c25125c160802c1e260769164f61bb3", "4e15c25124e15c25125c75978d314a26be0c94278a40", "4e15c25134e15c25125c631004bf28367b515497cb93", "4e15c25144e15c25125c78287e0534383a69f43f0acc", "4e15c25154e15c25125c23190df2c3896d7114826965", "4e15c25164e15c25125c11390b601f6dd170c40bc937", "4e15c25174e15c25125c81494e36352743b56417a82c", "b64baf11-c24c-481e-982c-4bdcd243385f", "4e15c25184e15c25125c526845a01ffe917f44e45af1", "4e15c25194e15c25125c78435201b7ba0eef54dfbb43", "4e15c251104e15c25125c451424b6190a75afc406c82", "4e15c251114e15c25125c765762bc03a417a8d493997", "2021-05-05T18:00:56.766145Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.974141300Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchesResume.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchesResume.json
index cb0869d27355..510d36fe8feb 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchesResume.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveContinueOnFailureBatchesResume.json
@@ -616,7 +616,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -639,7 +639,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBbuhNm33f7Hx0IY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWMxNGI2MjljOTFjZDYzODc2MzcyYTBkZmU2ZjJlOTQ0NjNmOGIvYjYyOWM5MWMxNWI2MjljOTFjZDYzNjY2NjRlYzNlYTMyZTljMDU0ZDg1ODEWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBbuhNm33f7Hx0IY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWMxNGI2MjljOTFjZDYzODc2MzcyYTBkZmU2ZjJlOTQ0NjNmOGIvYjYyOWM5MWMxNWI2MjljOTFjZDYzNjY2NjRlYzNlYTMyZTljMDU0ZDg1ODEWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -662,7 +662,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBa/lZee%2B7vB9BUY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWMzYjYyOWM5MWNkNjMwNjMyMzJjZTgzMDc5ZDIxYTQ3NTZiZDkvYjYyOWM5MWMxMmI2MjljOTFjZDYzNTg5NTYxNjRhMWY0YmFmNjA0NGZiODkWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBa/lZee%2B7vB9BUY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWMzYjYyOWM5MWNkNjMwNjMyMzJjZTgzMDc5ZDIxYTQ3NTZiZDkvYjYyOWM5MWMxMmI2MjljOTFjZDYzNTg5NTYxNjRhMWY0YmFmNjA0NGZiODkWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -685,7 +685,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaHtZX79qvd06sBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjM2I2MjljOTFjZDYzMDYzMjMyY2U4MzA3OWQyMWE0NzU2YmQ5L2I2MjljOTFjNGI2MjljOTFjZDYzOTY1NjkyZmE3MzAyYWE4ZmQ0NzcyOTVmFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaHtZX79qvd06sBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjM2I2MjljOTFjZDYzMDYzMjMyY2U4MzA3OWQyMWE0NzU2YmQ5L2I2MjljOTFjNGI2MjljOTFjZDYzOTY1NjkyZmE3MzAyYWE4ZmQ0NzcyOTVmFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -708,7 +708,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaCl/f0zdiuy58BGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjNmI2MjljOTFjZDYzMjU5MzcwN2Q5M2Q2NjhiNmI0ZWVkYWFmFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaCl/f0zdiuy58BGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjNmI2MjljOTFjZDYzMjU5MzcwN2Q5M2Q2NjhiNmI0ZWVkYWFmFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -731,7 +731,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBbkqM3djsm5gaMBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjNmI2MjljOTFjZDYzMjU5MzcwN2Q5M2Q2NjhiNmI0ZWVkYWFmL2I2MjljOTFjMTFiNjI5YzkxY2Q2MzQ5OTQyZmI1NWNiY2RhYzk0NDcwZGJiFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBbkqM3djsm5gaMBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS9iNjI5YzkxYzBiNjI5YzkxY2Q2MzEyNjkxMDQxMmJhZmJmYzBlNGE3YWE3NAEwMUQ3NDFEODk2RTVDNDVBL2I2MjljOTFjMmI2MjljOTFjZDYzNDk4NTRjNGEwZWJkMjI0MDU0MWEyOWE2L2I2MjljOTFjNmI2MjljOTFjZDYzMjU5MzcwN2Q5M2Q2NjhiNmI0ZWVkYWFmL2I2MjljOTFjMTFiNjI5YzkxY2Q2MzQ5OTQyZmI1NWNiY2RhYzk0NDcwZGJiFgAAAA%3D%3D&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -754,7 +754,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaHotWotJCA938Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWM2YjYyOWM5MWNkNjMyNTkzNzA3ZDkzZDY2OGI2YjRlZWRhYWYvYjYyOWM5MWM4YjYyOWM5MWNkNjM0Mjk0NTE5NzMwY2MyNThiNjQ1MDRhN2EWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/b629c91c0b629c91cd63126910412bafbfc0e4a7aa74/b629c91c2b629c91cd6349854c4a0ebd2240541a29a6?action=setAccessControlRecursive&continuation=VBaHotWotJCA938Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2I2MjljOTFjMGI2MjljOTFjZDYzMTI2OTEwNDEyYmFmYmZjMGU0YTdhYTc0ATAxRDc0MUQ4OTZFNUM0NUEvYjYyOWM5MWMyYjYyOWM5MWNkNjM0OTg1NGM0YTBlYmQyMjQwNTQxYTI5YTYvYjYyOWM5MWM2YjYyOWM5MWNkNjMyNTkzNzA3ZDkzZDY2OGI2YjRlZWRhYWYvYjYyOWM5MWM4YjYyOWM5MWNkNjM0Mjk0NTE5NzMwY2MyNThiNjQ1MDRhN2EWAAAA&mode=set&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=7d4cff68-b9ef-40d9-bd7e-5edff6d743d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -816,4 +816,4 @@
     "Exception" : null
   } ],
   "variables" : [ "b629c91c0b629c91cd63126910412bafbfc0e4a7aa74", "b629c91c1b629c91cd6335697c7fc2563fdec41acb8d", "b629c91c2b629c91cd6349854c4a0ebd2240541a29a6", "b629c91c3b629c91cd63063232ce83079d21a4756bd9", "b629c91c4b629c91cd63965692fa7302aa8fd477295f", "b629c91c5b629c91cd6399113ed569975e69f42a5afb", "b629c91c6b629c91cd632593707d93d668b6b4eedaaf", "b629c91c7b629c91cd6369954e00c22581fa84ec3b0b", "7d4cff68-b9ef-40d9-bd7e-5edff6d743d8", "b629c91c8b629c91cd634294519730cc258b64504a7a", "b629c91c9b629c91cd63625037dc6968a50c54824b5d", "b629c91c10b629c91cd63355714835161d718b4ded9e", "b629c91c11b629c91cd6349942fb55cbcdac94470dbb", "b629c91c12b629c91cd6358956164a1f4baf6044fb89", "b629c91c13b629c91cd6330410ccd1220676014b149a", "b629c91c14b629c91cd63876372a0dfe6f2e94463f8b", "b629c91c15b629c91cd6366664ec3ea32e9c054d8581", "2021-05-05T18:00:57.615679700Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:57.867670500Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveProgressWithFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveProgressWithFailure.json
index eb8825374a88..837bb255f0fc 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveProgressWithFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestSetACLRecursiveProgressWithFailure.json
@@ -374,7 +374,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/1ee09e6701ee09e67301479428853d52d64a640d5a5c/1ee09e6721ee09e6730157046f281d377a84349dfb3a?action=setAccessControlRecursive&mode=set&forceFlag=false&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=073d80fc-ce28-4ea6-acb2-1871c9f0d314&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/1ee09e6701ee09e67301479428853d52d64a640d5a5c/1ee09e6721ee09e6730157046f281d377a84349dfb3a?action=setAccessControlRecursive&mode=set&forceFlag=false&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=073d80fc-ce28-4ea6-acb2-1871c9f0d314&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -436,4 +436,4 @@
     "Exception" : null
   } ],
   "variables" : [ "1ee09e6701ee09e67301479428853d52d64a640d5a5c", "1ee09e6711ee09e67301774342946b6a836734c36844", "1ee09e6721ee09e6730157046f281d377a84349dfb3a", "1ee09e6731ee09e6730193159ec954965963c421ab63", "1ee09e6741ee09e673019914144fa8ccc7ab94b78978", "1ee09e6751ee09e6730106445294bcdd2eba749e9854", "1ee09e6761ee09e673013202339dad71789194a6b8e0", "1ee09e6771ee09e67301487802d1c932c917b48bf813", "073d80fc-ce28-4ea6-acb2-1871c9f0d314", "1ee09e6781ee09e67301222727a84df5fca914d90b00", "2021-05-05T18:00:56.680630100Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.920143100Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailure.json
index 810552d3b547..ac679030aad2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailure.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/121997fc0121997fcc9f5024795c584a1244c422183b/121997fc2121997fcc9f0402806bbc5903661426e8c1?action=setAccessControlRecursive&mode=modify&forceFlag=true&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=fa9cdf52-fbf0-412e-aa64-89390819d705&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/121997fc0121997fcc9f5024795c584a1244c422183b/121997fc2121997fcc9f0402806bbc5903661426e8c1?action=setAccessControlRecursive&mode=modify&forceFlag=true&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=fa9cdf52-fbf0-412e-aa64-89390819d705&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -502,4 +502,4 @@
     "Exception" : null
   } ],
   "variables" : [ "121997fc0121997fcc9f5024795c584a1244c422183b", "121997fc1121997fcc9f7316454a36c60f84e4d99af5", "121997fc2121997fcc9f0402806bbc5903661426e8c1", "121997fc3121997fcc9f5580386a1344b1f1348bfa3d", "121997fc4121997fcc9f7926797298ee2e17b4a97ba0", "121997fc5121997fcc9f965565d599220c57645b380a", "121997fc6121997fcc9f78186e200d92cfb174f20adf", "121997fc7121997fcc9f27636e534aab0eed84200bc0", "fa9cdf52-fbf0-412e-aa64-89390819d705", "121997fc8121997fcc9f4590599af896ed14541feb3d", "121997fc9121997fcc9f1606441269b873ca34137a86", "121997fc10121997fcc9f05104be0cdb56cc0d4c3897", "121997fc11121997fcc9f42883f9557cd51ad54064a7", "2021-05-05T18:00:57.036141Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:57.296687700Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchFailures.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchFailures.json
index e1ba07b41951..e6247da29afb 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchFailures.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchFailures.json
@@ -440,7 +440,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -463,7 +463,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBaCkovc6fO58QkY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2EzZjc1OWM0Y2E5OTk2NDIxM2I2YTk4ZTgyODIxYjQ1YzdiYjcvZjc1OWM0Y2E0Zjc1OWM0Y2E5OTk3NDc3NGFhMTM4YjJiN2VjMDQyNjZiZWIWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBaCkovc6fO58QkY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2EzZjc1OWM0Y2E5OTk2NDIxM2I2YTk4ZTgyODIxYjQ1YzdiYjcvZjc1OWM0Y2E0Zjc1OWM0Y2E5OTk3NDc3NGFhMTM4YjJiN2VjMDQyNjZiZWIWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -486,7 +486,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBaQsci37I3egXEYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBaQsci37I3egXEYwAEYugEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -509,7 +509,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBbHocLQsYTDj2AY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAvZjc1OWM0Y2ExMWY3NTljNGNhOTk5NDkwMDUzMDVmMjc5YTczYTY0NGZlYjcWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBbHocLQsYTDj2AY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAvZjc1OWM0Y2ExMWY3NTljNGNhOTk5NDkwMDUzMDVmMjc5YTczYTY0NGZlYjcWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -532,7 +532,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBa60qLOmLKIuS0Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAvZjc1OWM0Y2E4Zjc1OWM0Y2E5OTkxNTg1NWY5NGFjZThmNDI0ZTRiZmE5YmEWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/f759c4ca0f759c4ca99957562e1a04545e7284974860/f759c4ca2f759c4ca9990983153bacf1682bc4195aeb?action=setAccessControlRecursive&continuation=VBa60qLOmLKIuS0Y7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1L2Y3NTljNGNhMGY3NTljNGNhOTk5NTc1NjJlMWEwNDU0NWU3Mjg0OTc0ODYwATAxRDc0MUQ4OTZFNEQ5RDkvZjc1OWM0Y2EyZjc1OWM0Y2E5OTkwOTgzMTUzYmFjZjE2ODJiYzQxOTVhZWIvZjc1OWM0Y2E2Zjc1OWM0Y2E5OTkyNDExOTMxMTMyYjY5M2JmMDQ5YmY4MDAvZjc1OWM0Y2E4Zjc1OWM0Y2E5OTkxNTg1NWY5NGFjZThmNDI0ZTRiZmE5YmEWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=e5fa4124-73a5-4783-809a-638d2d0faae4&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -594,4 +594,4 @@
     "Exception" : null
   } ],
   "variables" : [ "f759c4ca0f759c4ca99957562e1a04545e7284974860", "f759c4ca1f759c4ca99931394f77cbdf94bf64de9a20", "f759c4ca2f759c4ca9990983153bacf1682bc4195aeb", "f759c4ca3f759c4ca99964213b6a98e82821b45c7bb7", "f759c4ca4f759c4ca99974774aa138b2b7ec04266beb", "f759c4ca5f759c4ca999740794769891b53074ab292b", "f759c4ca6f759c4ca9992411931132b693bf049bf800", "f759c4ca7f759c4ca9995039033cbb682ff2e4e0d8d1", "e5fa4124-73a5-4783-809a-638d2d0faae4", "f759c4ca8f759c4ca99915855f94ace8f424e4bfa9ba", "f759c4ca9f759c4ca99929590839632fc4da3496499c", "f759c4ca10f759c4ca999352965f9a7be43ea14f92b9", "f759c4ca11f759c4ca99949005305f279a73a644feb7", "2021-05-05T18:00:56.750145900Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:57.000139500Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchesResume.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchesResume.json
index f0bcc2ad63de..5b6267c33927 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchesResume.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveContinueOnFailureBatchesResume.json
@@ -616,7 +616,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -639,7 +639,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBau%2Btbl1K2tzN0BGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3MTQwZjY1Y2Y4N2U2MTY4NTI1OTc0OTZkNWEyMjU0NGJiZTgyLzBmNjVjZjg3MTUwZjY1Y2Y4N2U2MTUwODk3MjA0MWUwODQzNWUwNDQxNTkyFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBau%2Btbl1K2tzN0BGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3MTQwZjY1Y2Y4N2U2MTY4NTI1OTc0OTZkNWEyMjU0NGJiZTgyLzBmNjVjZjg3MTUwZjY1Y2Y4N2U2MTUwODk3MjA0MWUwODQzNWUwNDQxNTkyFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -662,7 +662,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBbulZCgqsnSxdMBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3MzBmNjVjZjg3ZTYxMzIzNDZhNDVlMjNiMTE1YjI0NjE3YmM5LzBmNjVjZjg3MTIwZjY1Y2Y4N2U2MTc4NjUyYTk0MmIzMTFkMmE2NDNjZGE0FgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBbulZCgqsnSxdMBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3MzBmNjVjZjg3ZTYxMzIzNDZhNDVlMjNiMTE1YjI0NjE3YmM5LzBmNjVjZjg3MTIwZjY1Y2Y4N2U2MTc4NjUyYTk0MmIzMTFkMmE2NDNjZGE0FgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -685,7 +685,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBajmoun8OjapXIY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzBmNjVjZjg3MDBmNjVjZjg3ZTYxOTEyMDk4ZTUyMmE4YThhYjY0YTJjYTdiATAxRDc0MUQ4OTZFNUM0NUEvMGY2NWNmODcyMGY2NWNmODdlNjExMjAzMzBmMzllYTk2NDJjYTRiZTBhNzkvMGY2NWNmODczMGY2NWNmODdlNjEzMjM0NmE0NWUyM2IxMTViMjQ2MTdiYzkvMGY2NWNmODc0MGY2NWNmODdlNjE4NjAxMmFjNGNjYzI0NDYwNDQwMzM5MGEWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBajmoun8OjapXIY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzBmNjVjZjg3MDBmNjVjZjg3ZTYxOTEyMDk4ZTUyMmE4YThhYjY0YTJjYTdiATAxRDc0MUQ4OTZFNUM0NUEvMGY2NWNmODcyMGY2NWNmODdlNjExMjAzMzBmMzllYTk2NDJjYTRiZTBhNzkvMGY2NWNmODczMGY2NWNmODdlNjEzMjM0NmE0NWUyM2IxMTViMjQ2MTdiYzkvMGY2NWNmODc0MGY2NWNmODdlNjE4NjAxMmFjNGNjYzI0NDYwNDQwMzM5MGEWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -708,7 +708,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBbt3OW0kcaDtZoBGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3NjBmNjVjZjg3ZTYxNDg3NjVkZWYzNWEwZjg1MmU0MDFiYjBlFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBbt3OW0kcaDtZoBGMABGLoBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3NjBmNjVjZjg3ZTYxNDg3NjVkZWYzNWEwZjg1MmU0MDFiYjBlFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -731,7 +731,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBaq5p%2BRm7%2Bv9awBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3NjBmNjVjZjg3ZTYxNDg3NjVkZWYzNWEwZjg1MmU0MDFiYjBlLzBmNjVjZjg3MTEwZjY1Y2Y4N2U2MTQxOTI5OTA0ZjQ5YjE4Y2Y2NGNlYTkyFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBaq5p%2BRm7%2Bv9awBGO0BGOcBL2thc29ib2xjYW5hZGFobnMBMDFENzQxQzhFOTY5NTAxNS8wZjY1Y2Y4NzAwZjY1Y2Y4N2U2MTkxMjA5OGU1MjJhOGE4YWI2NGEyY2E3YgEwMUQ3NDFEODk2RTVDNDVBLzBmNjVjZjg3MjBmNjVjZjg3ZTYxMTIwMzMwZjM5ZWE5NjQyY2E0YmUwYTc5LzBmNjVjZjg3NjBmNjVjZjg3ZTYxNDg3NjVkZWYzNWEwZjg1MmU0MDFiYjBlLzBmNjVjZjg3MTEwZjY1Y2Y4N2U2MTQxOTI5OTA0ZjQ5YjE4Y2Y2NGNlYTkyFgAAAA%3D%3D&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -754,7 +754,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBaok7z2s9uu4jgY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzBmNjVjZjg3MDBmNjVjZjg3ZTYxOTEyMDk4ZTUyMmE4YThhYjY0YTJjYTdiATAxRDc0MUQ4OTZFNUM0NUEvMGY2NWNmODcyMGY2NWNmODdlNjExMjAzMzBmMzllYTk2NDJjYTRiZTBhNzkvMGY2NWNmODc2MGY2NWNmODdlNjE0ODc2NWRlZjM1YTBmODUyZTQwMWJiMGUvMGY2NWNmODc4MGY2NWNmODdlNjE4NjY2MGY4YTNhYzY4OWQ4YTQzYjFiMDIWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-08-04&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b/0f65cf8720f65cf87e61120330f39ea9642ca4be0a79?action=setAccessControlRecursive&continuation=VBaok7z2s9uu4jgY7QEY5wEva2Fzb2JvbGNhbmFkYWhucwEwMUQ3NDFDOEU5Njk1MDE1LzBmNjVjZjg3MDBmNjVjZjg3ZTYxOTEyMDk4ZTUyMmE4YThhYjY0YTJjYTdiATAxRDc0MUQ4OTZFNUM0NUEvMGY2NWNmODcyMGY2NWNmODdlNjExMjAzMzBmMzllYTk2NDJjYTRiZTBhNzkvMGY2NWNmODc2MGY2NWNmODdlNjE0ODc2NWRlZjM1YTBmODUyZTQwMWJiMGUvMGY2NWNmODc4MGY2NWNmODdlNjE4NjY2MGY4YTNhYzY4OWQ4YTQzYjFiMDIWAAAA&mode=modify&forceFlag=true&maxRecords=2&sv=2020-10-02&se=2021-05-05T19%3A00%3A57Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A57Z&ske=2021-05-05T19%3A00%3A57Z&sks=b&skv=2020-08-04&suoid=2694e848-4720-4d6a-867d-b789482013d8&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -816,4 +816,4 @@
     "Exception" : null
   } ],
   "variables" : [ "0f65cf8700f65cf87e61912098e522a8a8ab64a2ca7b", "0f65cf8710f65cf87e61391110f7fde144c374eef9ec", "0f65cf8720f65cf87e61120330f39ea9642ca4be0a79", "0f65cf8730f65cf87e6132346a45e23b115b24617bc9", "0f65cf8740f65cf87e6186012ac4ccc244604403390a", "0f65cf8750f65cf87e613310468f073aa589345fc9e9", "0f65cf8760f65cf87e6148765def35a0f852e401bb0e", "0f65cf8770f65cf87e61372304984685bf6e941999d5", "2694e848-4720-4d6a-867d-b789482013d8", "0f65cf8780f65cf87e6186660f8a3ac689d8a43b1b02", "0f65cf8790f65cf87e6179184b9ca293cb20d47598ef", "0f65cf87100f65cf87e61347639412c5fea780436298", "0f65cf87110f65cf87e6141929904f49b18cf64cea92", "0f65cf87120f65cf87e6178652a942b311d2a643cda4", "0f65cf87130f65cf87e6183149783d1ac461764de992", "0f65cf87140f65cf87e616852597496d5a22544bbe82", "0f65cf87150f65cf87e61508972041e08435e0441592", "2021-05-05T18:00:57.673674800Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:57.909073700Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveProgressWithFailure.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveProgressWithFailure.json
index 406f81256870..8f4606b9edc1 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveProgressWithFailure.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/DirectoryAPITestUpdateACLRecursiveProgressWithFailure.json
@@ -374,7 +374,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/61abb28d061abb28da3631487b0ddffcc36d4488ca1f/61abb28d261abb28da369136227846db02eb64cbd954?action=setAccessControlRecursive&mode=modify&forceFlag=false&sv=2020-08-04&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=c8354358-bf30-4a47-affb-b7a95f321e64&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/61abb28d061abb28da3631487b0ddffcc36d4488ca1f/61abb28d261abb28da369136227846db02eb64cbd954?action=setAccessControlRecursive&mode=modify&forceFlag=false&sv=2020-10-02&se=2021-05-05T19%3A00%3A56Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A56Z&ske=2021-05-05T19%3A00%3A56Z&sks=b&skv=2020-08-04&suoid=c8354358-bf30-4a47-affb-b7a95f321e64&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -436,4 +436,4 @@
     "Exception" : null
   } ],
   "variables" : [ "61abb28d061abb28da3631487b0ddffcc36d4488ca1f", "61abb28d161abb28da3694464923e010ad21045b4ada", "61abb28d261abb28da369136227846db02eb64cbd954", "61abb28d361abb28da36282626b6c888079794b3f8f9", "61abb28d461abb28da3693769cb7077591c85498c82a", "61abb28d561abb28da3686615de625b7d7cba4df78ab", "61abb28d661abb28da36758276a875ded4ebc4e3bb0b", "61abb28d761abb28da36424658391fd55031f4c65aac", "c8354358-bf30-4a47-affb-b7a95f321e64", "61abb28d861abb28da36689985c8a4fdf35364076a4d", "2021-05-05T18:00:56.473632400Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "2021-05-05T18:00:56.680630100Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystem.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystem.json
index 402bbacd2e25..8f1f56596c51 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystem.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystem.json
@@ -87,7 +87,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b8dda32b2b8dda32b415081503c482939e8ba4d9498c?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=rc&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b8dda32b2b8dda32b415081503c482939e8ba4d9498c?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=rc&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -167,4 +167,4 @@
     "Exception" : null
   } ],
   "variables" : [ "b8dda32b0b8dda32b415155058d55880da3f94853ae9", "b8dda32b1b8dda32b415277085bcf9f26213f44ab81d", "2021-05-05T17:53:43.401830200Z", "b8dda32b2b8dda32b415081503c482939e8ba4d9498c" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystemError.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystemError.json
index 20be9bbd2cd7..a983efe913d2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystemError.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasCreateFileSystemError.json
@@ -87,7 +87,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/dc9eb9582dc9eb9589f9378634585c5759fbf46b2bab?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/dc9eb9582dc9eb9589f9378634585c5759fbf46b2bab?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -149,4 +149,4 @@
     "Exception" : null
   } ],
   "variables" : [ "dc9eb9580dc9eb9589f9336589e171c910b7743f09b9", "dc9eb9581dc9eb9589f982064aec77f6075ca408b8f6", "2021-05-05T17:53:43.393832700Z", "dc9eb9582dc9eb9589f9378634585c5759fbf46b2bab" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileDeleteError.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileDeleteError.json
index 6d7c8d0e93e6..c81c8ede48b2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileDeleteError.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileDeleteError.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/de5f996f0de5f996fb0f33821e4a0cecf51314842b0b/de5f996f2de5f996fb0f61367818a55517d644c48aab?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/de5f996f0de5f996fb0f33821e4a0cecf51314842b0b/de5f996f2de5f996fb0f61367818a55517d644c48aab?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -171,4 +171,4 @@
     "Exception" : null
   } ],
   "variables" : [ "de5f996f0de5f996fb0f33821e4a0cecf51314842b0b", "de5f996f1de5f996fb0f51463475aec7d034a4536a27", "de5f996f2de5f996fb0f61367818a55517d644c48aab", "2021-05-05T17:53:43.502829200Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileRead.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileRead.json
index 1242536acbe6..c3dd3e42aebb 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileRead.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasFileRead.json
@@ -152,7 +152,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/d427b9070d427b907451542233d38aec9f91b4b1887e/d427b9072d427b9074518730214a895b24cd148b6910?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d427b9070d427b907451542233d38aec9f91b4b1887e/d427b9072d427b9074518730214a895b24cd148b6910?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -224,4 +224,4 @@
     "Exception" : null
   } ],
   "variables" : [ "d427b9070d427b907451542233d38aec9f91b4b1887e", "d427b9071d427b9074517976391161a82263441cdbcc", "d427b9072d427b9074518730214a895b24cd148b6910", "2021-05-05T17:53:43.680824800Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasTokenOnEndpoint.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasTokenOnEndpoint.json
index ab8c41f0e52a..4edae31ba09a 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasTokenOnEndpoint.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestAccountSasTokenOnEndpoint.json
@@ -87,7 +87,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7f8d84b127f8d84b1c0b1580044c5e60b099643d6973?restype=container&sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7f8d84b127f8d84b1c0b1580044c5e60b099643d6973?restype=container&sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sp=rc&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -189,4 +189,4 @@
     "Exception" : null
   } ],
   "variables" : [ "7f8d84b107f8d84b1c0b19948ea741a1290f745559b3", "7f8d84b117f8d84b1c0b06630e5417149a7dd44d083d", "2021-05-05T17:53:43.393832700Z", "7f8d84b127f8d84b1c0b1580044c5e60b099643d6973", "7f8d84b137f8d84b1c0b461196bd17838cad849fb96f" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestCanUseSasToAuthenticate.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestCanUseSasToAuthenticate.json
index a7ce4297e8df..ad3b76b744ac 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestCanUseSasToAuthenticate.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestCanUseSasToAuthenticate.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -136,7 +136,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -163,7 +163,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5?restype=container&sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -190,7 +190,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -224,7 +224,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -258,7 +258,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -292,7 +292,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -328,7 +328,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -362,7 +362,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ad761e9d0ad761e9d8557718465bee3f0f79a467fae5/ad761e9d2ad761e9d85554263a316e34d0d364444a91?sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -396,7 +396,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -417,7 +417,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=b&srt=sco&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -438,7 +438,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
+    "Uri" : "https://REDACTED.blob.core.windows.net?restype=service&comp=properties&sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sp=r&sig=REDACTED&ss=b&srt=sco",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -499,4 +499,4 @@
     "Exception" : null
   } ],
   "variables" : [ "ad761e9d0ad761e9d8557718465bee3f0f79a467fae5", "ad761e9d1ad761e9d8559846464a60c34fb45429790f", "2021-05-05T17:53:43.393832700Z", "ad761e9d2ad761e9d85554263a316e34d0d364444a91" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermission.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermission.json
index 5d181dfea5c6..e32b29ff59b4 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermission.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermission.json
@@ -131,7 +131,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/e14f20a70e14f20a7fe147121af251d1eae6c4b70aac/e14f20a72e14f20a7fe131662d6fedc03363e4abaa85?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A53%3A46Z&se=2021-05-06T17%3A53%3A46Z&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e14f20a70e14f20a7fe147121af251d1eae6c4b70aac/e14f20a72e14f20a7fe131662d6fedc03363e4abaa85?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T17%3A53%3A46Z&se=2021-05-06T17%3A53%3A46Z&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -169,7 +169,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/e14f20a70e14f20a7fe147121af251d1eae6c4b70aac/e14f20a72e14f20a7fe131662d6fedc03363e4abaa85%2Fe14f20a73e14f20a7fe104338bde20c65c3f5415899a?resource=directory&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A53%3A46Z&se=2021-05-06T17%3A53%3A46Z&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/e14f20a70e14f20a7fe147121af251d1eae6c4b70aac/e14f20a72e14f20a7fe131662d6fedc03363e4abaa85%2Fe14f20a73e14f20a7fe104338bde20c65c3f5415899a?resource=directory&sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T17%3A53%3A46Z&se=2021-05-06T17%3A53%3A46Z&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -231,4 +231,4 @@
     "Exception" : null
   } ],
   "variables" : [ "e14f20a70e14f20a7fe147121af251d1eae6c4b70aac", "e14f20a71e14f20a7fe1392117f646f7e8acb44e4bc2", "e14f20a72e14f20a7fe131662d6fedc03363e4abaa85", "2021-05-05T17:53:46.642524200Z", "2021-05-05T17:53:46.642524200Z", "e14f20a73e14f20a7fe104338bde20c65c3f5415899a" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermissionFail.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermissionFail.json
index 7e107267bc9e..f4dd39ce1cc0 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermissionFail.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectorySasPermissionFail.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/6e08620f06e08620ff23605631c40edf02c254d64856/6e08620f26e08620ff2382993030fde78cb664e419c8?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=d&sp=cwd&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6e08620f06e08620ff23605631c40edf02c254d64856/6e08620f26e08620ff2382993030fde78cb664e419c8?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=d&sp=cwd&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -168,4 +168,4 @@
     "Exception" : null
   } ],
   "variables" : [ "6e08620f06e08620ff23605631c40edf02c254d64856", "6e08620f16e08620ff233865239fead58654f4fd28c8", "6e08620f26e08620ff2382993030fde78cb664e419c8", "2021-05-05T17:53:43.491827300Z", "2021-05-05T17:53:43.491827300Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectoryUserDelegation.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectoryUserDelegation.json
index 08ec00f72752..ea571e89e6e2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectoryUserDelegation.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestDirectoryUserDelegation.json
@@ -131,7 +131,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9/7fa197f627fa197f66080192262e1ebaa7d8546f5919?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9/7fa197f627fa197f66080192262e1ebaa7d8546f5919?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -169,7 +169,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9/7fa197f627fa197f66080192262e1ebaa7d8546f5919%2F7fa197f637fa197f6608349744cf05299f4de437a92d?resource=directory&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9/7fa197f627fa197f66080192262e1ebaa7d8546f5919%2F7fa197f637fa197f6608349744cf05299f4de437a92d?resource=directory&sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -191,7 +191,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9?resource=filesystem&directory=7fa197f627fa197f66080192262e1ebaa7d8546f5919&recursive=false&upn=false&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/7fa197f607fa197f6608501609a8f5bead8e548448e9?resource=filesystem&directory=7fa197f627fa197f66080192262e1ebaa7d8546f5919&recursive=false&upn=false&sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=d&sp=racwdlmeop&sdd=1&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -252,4 +252,4 @@
     "Exception" : null
   } ],
   "variables" : [ "7fa197f607fa197f6608501609a8f5bead8e548448e9", "7fa197f617fa197f6608043486b0388e87064402184e", "7fa197f627fa197f66080192262e1ebaa7d8546f5919", "2021-05-05T18:00:54.414571600Z", "2021-05-05T18:00:54.414571600Z", "2021-05-05T18:00:54.418570700Z", "2021-05-05T18:00:54.418570700Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "7fa197f637fa197f6608349744cf05299f4de437a92d" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSasPermission.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSasPermission.json
index 3246f56f3c6b..16826515d0a7 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSasPermission.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSasPermission.json
@@ -87,7 +87,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/eb2e24170eb2e241727e679862bc181c895854f7591d/eb2e24171eb2e241727e46158611c3b4ad072434f89b?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/eb2e24170eb2e241727e679862bc181c895854f7591d/eb2e24171eb2e241727e46158611c3b4ad072434f89b?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -123,7 +123,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/eb2e24170eb2e241727e679862bc181c895854f7591d/eb2e24171eb2e241727e46158611c3b4ad072434f89b?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/eb2e24170eb2e241727e679862bc181c895854f7591d/eb2e24171eb2e241727e46158611c3b4ad072434f89b?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T17%3A53%3A43Z&se=2021-05-06T17%3A53%3A43Z&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -200,4 +200,4 @@
     "Exception" : null
   } ],
   "variables" : [ "eb2e24170eb2e241727e679862bc181c895854f7591d", "eb2e24171eb2e241727e46158611c3b4ad072434f89b", "2021-05-05T17:53:43.374831600Z", "2021-05-05T17:53:43.379831300Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemSasIdentifier.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemSasIdentifier.json
index e176f7c5cc51..cbc1c7393421 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemSasIdentifier.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemSasIdentifier.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/ab46431a0ab46431a3b21492081564b8492e14999bd9?resource=filesystem&recursive=false&upn=false&sv=2020-08-04&si=0000&sr=c&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/ab46431a0ab46431a3b21492081564b8492e14999bd9?resource=filesystem&recursive=false&upn=false&sv=2020-10-02&si=0000&sr=c&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -130,7 +130,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/ab46431a0ab46431a3b21492081564b8492e14999bd9?resource=filesystem&recursive=false&upn=false&sv=2020-08-04&se=2021-05-06T17%3A53%3A43Z&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/ab46431a0ab46431a3b21492081564b8492e14999bd9?resource=filesystem&recursive=false&upn=false&sv=2020-10-02&se=2021-05-06T17%3A53%3A43Z&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -191,4 +191,4 @@
     "Exception" : null
   } ],
   "variables" : [ "ab46431a0ab46431a3b21492081564b8492e14999bd9", "ab46431a1ab46431a3b26634150f1e6d5a25146d8872", "2021-05-05T17:53:43.377831900Z", "2021-05-05T17:53:43.503828Z" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegation.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegation.json
index 19c3ad591a05..6a711a39f798 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegation.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegation.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/51c8f405051c8f4054156072994533211a32a4cc384d?resource=filesystem&recursive=false&upn=false&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/51c8f405051c8f4054156072994533211a32a4cc384d?resource=filesystem&recursive=false&upn=false&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -170,4 +170,4 @@
     "Exception" : null
   } ],
   "variables" : [ "51c8f405051c8f4054156072994533211a32a4cc384d", "51c8f405151c8f40541599150b6e89bfdea89463dbd4", "2021-05-05T18:00:54.300571400Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationId.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationId.json
index bcb9f63e5f63..27583f6ea9bf 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationId.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationId.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/e4978ce50e4978ce532025052603b777533e84843a2c?resource=filesystem&recursive=false&upn=false&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&scid=f3ad378d-a574-425b-9035-111d19645618&sr=c&sp=l&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/e4978ce50e4978ce532025052603b777533e84843a2c?resource=filesystem&recursive=false&upn=false&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&scid=f3ad378d-a574-425b-9035-111d19645618&sr=c&sp=l&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -170,4 +170,4 @@
     "Exception" : null
   } ],
   "variables" : [ "e4978ce50e4978ce532025052603b777533e84843a2c", "e4978ce51e4978ce53201458885079ea0835f42a2ae0", "2021-05-05T18:00:54.305569900Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "f3ad378d-a574-425b-9035-111d19645618" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationIdError.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationIdError.json
index de88992c9159..22564584d8a3 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationIdError.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileSystemUserDelegationCorrelationIdError.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/19e94ac4019e94ac45c20649625366eba83504dfe927?resource=filesystem&recursive=false&upn=false&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&scid=invalidcid&sr=c&sp=l&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/19e94ac4019e94ac45c20649625366eba83504dfe927?resource=filesystem&recursive=false&upn=false&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&scid=invalidcid&sr=c&sp=l&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -171,4 +171,4 @@
     "Exception" : null
   } ],
   "variables" : [ "19e94ac4019e94ac45c20649625366eba83504dfe927", "19e94ac4119e94ac45c2786101b6dd38b45aa420e908", "2021-05-05T18:00:54.298570Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegation.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegation.json
index d356bcc9ea79..440861ee7483 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegation.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegation.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b4ca457e0b4ca457e89223457c1e0edab9d60448daea/b4ca457e1b4ca457e89257857f7e4d073ad594047a04?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b4ca457e0b4ca457e89223457c1e0edab9d60448daea/b4ca457e1b4ca457e89257857f7e4d073ad594047a04?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -145,7 +145,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/b4ca457e0b4ca457e89223457c1e0edab9d60448daea/b4ca457e1b4ca457e89257857f7e4d073ad594047a04?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b4ca457e0b4ca457e89223457c1e0edab9d60448daea/b4ca457e1b4ca457e89257857f7e4d073ad594047a04?sv=2020-10-02&spr=https%2Chttp&st=2021-05-04T18%3A00%3A54Z&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-04T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&sr=b&sp=racwdlmeop&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -222,4 +222,4 @@
     "Exception" : null
   } ],
   "variables" : [ "b4ca457e0b4ca457e89223457c1e0edab9d60448daea", "b4ca457e1b4ca457e89257857f7e4d073ad594047a04", "2021-05-05T18:00:54.301569400Z", "2021-05-05T18:00:54.305569900Z", "2021-05-05T18:00:54.312570900Z", "2021-05-05T18:00:54.312570900Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSaoid.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSaoid.json
index e8e9c8975675..12a0b78264f2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSaoid.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSaoid.json
@@ -131,7 +131,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?resource=file&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?resource=file&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -153,7 +153,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?action=append&position=0&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?action=append&position=0&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -174,7 +174,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?action=flush&position=7&retainUncommittedData=false&close=false&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/71d9a559071d9a55901996536caf202d3e80d4a7ca32/71d9a559271d9a55901932223b4affbbde4fd4fb0a28?action=flush&position=7&retainUncommittedData=false&close=false&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A55Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&saoid=a6b7400f-7745-4668-beb1-e89417a9d116&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -260,4 +260,4 @@
     "Exception" : null
   } ],
   "variables" : [ "71d9a559071d9a55901996536caf202d3e80d4a7ca32", "71d9a559171d9a55901951646fa35a3fbb48c47eba01", "a6b7400f-7745-4668-beb1-e89417a9d116", "71d9a559271d9a55901932223b4affbbde4fd4fb0a28", "2021-05-05T18:00:54.303571Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSuoid.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSuoid.json
index 043e8bdaf69b..b9c17e395a5e 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSuoid.json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestFileUserDelegationSuoid.json
@@ -109,7 +109,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?resource=file&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=b&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?resource=file&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=b&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -153,7 +153,7 @@
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?resource=file&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?resource=file&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -175,7 +175,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?action=append&position=0&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?action=append&position=0&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -196,7 +196,7 @@
     "Exception" : null
   }, {
     "Method" : "PATCH",
-    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?action=flush&position=7&retainUncommittedData=false&close=false&sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.dfs.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?action=flush&position=7&retainUncommittedData=false&close=false&sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=71c20f45-47fb-4d5c-b837-210ee310650f&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -242,7 +242,7 @@
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.blob.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?sv=2020-08-04&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=846aad75-21c9-4676-9ab4-b8cf2d8e1180&sr=c&sp=racwdlmeop&sig=REDACTED",
+    "Uri" : "https://REDACTED.blob.core.windows.net/aea265910aea26591b156731514cc0fd44be2468d8cd/aea265912aea26591b1509482c9defb254583471898d?sv=2020-10-02&se=2021-05-06T18%3A00%3A54Z&skoid=e339aa3f-fc6a-402b-973a-31cd8d64b280&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2021-05-05T18%3A00%3A54Z&ske=2021-05-06T18%3A00%3A54Z&sks=b&skv=2020-08-04&suoid=846aad75-21c9-4676-9ab4-b8cf2d8e1180&sr=c&sp=racwdlmeop&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -301,4 +301,4 @@
     "Exception" : null
   } ],
   "variables" : [ "aea265910aea26591b156731514cc0fd44be2468d8cd", "aea265911aea26591b150009425bae14064ad4abc8fa", "71c20f45-47fb-4d5c-b837-210ee310650f", "aea265912aea26591b1509482c9defb254583471898d", "2021-05-05T18:00:54.300571400Z", "e339aa3f-fc6a-402b-973a-31cd8d64b280", "72f988bf-86f1-41af-91ab-2d7cd011db47", "846aad75-21c9-4676-9ab4-b8cf2d8e1180" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[0].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[0].json
index 8addf955a4ca..31573389c80e 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[0].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[0].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/b4d9705c0b4d9705c27e679384bd3e6752be1483e807?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "6fdae249-431c-4967-a8d7-5778ba44d567"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE97230275",
       "Last-Modified" : "Wed, 05 May 2021 15:58:14 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/b4d9705c0b4d9705c27e679384bd3e6752be1483e807/b4d9705c1b4d9705c27e07761cbff776bf1cc4dcfb90?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "dd2e19cd-4847-46ee-8e9d-d9ebeeca9058"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE973CA473",
       "Last-Modified" : "Wed, 05 May 2021 15:58:14 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/b4d9705c0b4d9705c27e679384bd3e6752be1483e807/b4d9705c1b4d9705c27e07761cbff776bf1cc4dcfb90?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "252fe0f4-9e15-4857-971d-683f2b6bb489",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/b4d9705c0b4d9705c27e679384bd3e6752be1483e807/b4d9705c1b4d9705c27e07761cbff776bf1cc4dcfb90?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cfcb8e4e-2a42-4907-b0db-973c02790dc8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE975898A3",
       "Last-Modified" : "Wed, 05 May 2021 15:58:14 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=b4d9705c",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "bf77f55e-249e-4a64-b0ab-b21e63d7aed3"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/b4d9705c0b4d9705c27e679384bd3e6752be1483e807?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7c8469db-b905-49f0-b9d1-67e950165955"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "b4d9705c0b4d9705c27e679384bd3e6752be1483e807", "b4d9705c1b4d9705c27e07761cbff776bf1cc4dcfb90" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[10].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[10].json
index 6f31890cd2c7..3ad24af9876d 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[10].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[10].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/742079b60742079b6267215102065d159afc843469d0?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "eb060e02-571d-49fa-a59f-55b771a551b8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A4B9042",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/742079b60742079b6267215102065d159afc843469d0/742079b61742079b626769777007331fb205946e0849?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cd7fa323-3b25-45c4-8da1-c27804454be8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A5BEDDF",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/742079b60742079b6267215102065d159afc843469d0/742079b61742079b626769777007331fb205946e0849?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "4804c38c-0368-4219-9599-c97e6732ce76",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/742079b60742079b6267215102065d159afc843469d0/742079b61742079b626769777007331fb205946e0849?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "04b73bb1-29aa-4582-9528-672836c05f46"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A766B12",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=742079b6",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2ecb11db-0e13-4927-9027-f1c69de743ab"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/742079b60742079b6267215102065d159afc843469d0?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "5173561d-da20-4a7c-a778-17a9e43245b6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "742079b60742079b6267215102065d159afc843469d0", "742079b61742079b626769777007331fb205946e0849" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[11].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[11].json
index bb5c56e945a0..55633a742f8c 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[11].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[11].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/6d3b48f706d3b48f725903809dca951fca9c946e99f9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "828c1040-39b2-468f-9101-da19a0c1492d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A8434F7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/6d3b48f706d3b48f725903809dca951fca9c946e99f9/6d3b48f716d3b48f725916020e7cdb57471de4fbdbb3?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7ce6716f-cbc5-44a9-9d11-78e8bbe08a34"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A936521",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/6d3b48f706d3b48f725903809dca951fca9c946e99f9/6d3b48f716d3b48f725916020e7cdb57471de4fbdbb3?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "9cbbd047-c704-4071-a56d-b04f682626e1",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/6d3b48f706d3b48f725903809dca951fca9c946e99f9/6d3b48f716d3b48f725916020e7cdb57471de4fbdbb3?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c5d4605b-2aa4-4618-bedf-23aee1d0865e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AACC616",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=6d3b48f7",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "84d4995a-6335-44e7-828a-774c6d505f86"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/6d3b48f706d3b48f725903809dca951fca9c946e99f9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "79911643-4fc3-4279-ba44-8fa90e915aa5"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "6d3b48f706d3b48f725903809dca951fca9c946e99f9", "6d3b48f716d3b48f725916020e7cdb57471de4fbdbb3" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[12].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[12].json
index d7a3f5136bb7..8c5b2416b268 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[12].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[12].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/46161b34046161b34c2565774d72aa15eff7e4ae6a2b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "8b157fb6-e853-4e9b-aba8-56a8c968b772"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A9E3801",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/46161b34046161b34c2565774d72aa15eff7e4ae6a2b/46161b34146161b34c2580756f5799062ec6f4b27b7e?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "98cc9e4f-88f9-4112-beb7-cf506dbb0813"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AAE8B3C",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/46161b34046161b34c2565774d72aa15eff7e4ae6a2b/46161b34146161b34c2580756f5799062ec6f4b27b7e?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cb28d5a5-4fdb-44cf-9d47-357e9268ea16",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/46161b34046161b34c2565774d72aa15eff7e4ae6a2b/46161b34146161b34c2580756f5799062ec6f4b27b7e?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "f12a0b91-d2ce-4ea6-93a7-0452162f6585"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9ACB7EC0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=46161b34",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d2d8a990-3cf3-46d7-bc05-8cdf59093a0b"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/46161b34046161b34c2565774d72aa15eff7e4ae6a2b?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2c715f8c-4a75-4b06-bba4-7c3bcc56b878"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "46161b34046161b34c2565774d72aa15eff7e4ae6a2b", "46161b34146161b34c2580756f5799062ec6f4b27b7e" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[13].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[13].json
index d7e251b16db0..046cee6ba872 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[13].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[13].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "acbcd7c8-5f5f-4142-8df6-1895115e15ff"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AC630C0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab/5f0d2a7515f0d2a754da07254e44de9d5959d4a6187c?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "db55898b-ac81-481d-bf79-8d2005237fa7"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AD5668F",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab/5f0d2a7515f0d2a754da07254e44de9d5959d4a6187c?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "0867f8b1-dda5-499a-af9b-3c1daf037f55",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab/5f0d2a7515f0d2a754da07254e44de9d5959d4a6187c?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "638085f0-044a-4155-851f-bf57f365d6ae"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AF082E7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=5f0d2a75",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "06b96a77-3a1c-49b7-a53e-6fa405654716"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "da26bef1-c3cb-4fc0-b276-158f5524b87f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "5f0d2a7505f0d2a754da31929f487a5c5b3b545e79ab", "5f0d2a7515f0d2a754da07254e44de9d5959d4a6187c" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[14].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[14].json
index fddb8b79c2f0..f9836709e337 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[14].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[14].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/104cbcb20104cbcb2dae77982b14280427a6548a9a22?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "f9ff15ec-6f16-455f-98b9-051a247a810e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AD795ED",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/104cbcb20104cbcb2dae77982b14280427a6548a9a22/104cbcb21104cbcb2dae08459d153da99eee346e78a1?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "79fd3f20-b363-4680-a9ba-b40d97ee83c2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AE64351",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/104cbcb20104cbcb2dae77982b14280427a6548a9a22/104cbcb21104cbcb2dae08459d153da99eee346e78a1?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d4570517-8b8e-4776-acf9-b67942ec9454",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/104cbcb20104cbcb2dae77982b14280427a6548a9a22/104cbcb21104cbcb2dae08459d153da99eee346e78a1?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "a0cbf0a4-6b27-46bf-b6f6-fa0ea09fd3b9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B00457A",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=104cbcb2",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2835eb5e-66ec-4ba4-833a-0c5125e23fcb"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/104cbcb20104cbcb2dae77982b14280427a6548a9a22?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2409153f-475d-42f9-a11a-23014e80eeaf"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "104cbcb20104cbcb2dae77982b14280427a6548a9a22", "104cbcb21104cbcb2dae08459d153da99eee346e78a1" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[15].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[15].json
index acca420a20c3..ceb2817d7240 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[15].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[15].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/09578df3009578df3fc848436e400f03d7ff54002982?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "223662c6-df4f-4917-a02e-4e26efc2958e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AF460F4",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/09578df3009578df3fc848436e400f03d7ff54002982/09578df3109578df3fc803504c2d97ce5df084a96bd8?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "3afbf454-4b9a-421f-a59b-30a2f17545fe"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B0473B7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/09578df3009578df3fc848436e400f03d7ff54002982/09578df3109578df3fc803504c2d97ce5df084a96bd8?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c18a1873-6ad5-4082-af05-771f69809f94",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/09578df3009578df3fc848436e400f03d7ff54002982/09578df3109578df3fc803504c2d97ce5df084a96bd8?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "88bbce21-fc14-4f2f-97f3-15baa182d298"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B1F7BA0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=09578df3",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c7808307-aa9a-4046-8343-9a66ad1e9451"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/09578df3009578df3fc848436e400f03d7ff54002982?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ba0acfdb-b1c6-4fac-98c9-8371bd3b11ba"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "09578df3009578df3fc848436e400f03d7ff54002982", "09578df3109578df3fc803504c2d97ce5df084a96bd8" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[16].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[16].json
index fab15bc8a23e..4a36058a44cf 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[16].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[16].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/227ade300227ade3060697389f51472a1f4924767965?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ed505750-18ee-4a86-bdaa-d726d73b2df2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B1811B8",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/227ade300227ade3060697389f51472a1f4924767965/227ade301227ade3060664526841c86b2b5a548cf931?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "88557ca6-66a2-4b16-b0df-7b89bc6243f4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B27F2D0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/227ade300227ade3060697389f51472a1f4924767965/227ade301227ade3060664526841c86b2b5a548cf931?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "e37296ec-b8db-4936-a195-35fdf83ed2f4",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/227ade300227ade3060697389f51472a1f4924767965/227ade301227ade3060664526841c86b2b5a548cf931?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "b5ecb922-cc18-4f39-a9b0-33ac2b37096c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B421AF9",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=227ade30",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "1314e82c-448b-45c2-bc2a-fda44728cd4b"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/227ade300227ade3060697389f51472a1f4924767965?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "26b9010f-9464-4846-afb8-7fcfd816c343"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "227ade300227ade3060697389f51472a1f4924767965", "227ade301227ade3060664526841c86b2b5a548cf931" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[17].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[17].json
index 1978c0a9ae8a..60e1b0316c6d 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[17].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[17].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/3b61ef7103b61ef71c8916850e44eecf4803a4786ace?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "73197d8c-fece-4ca5-b840-e7024cc45272"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B2B1838",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3b61ef7103b61ef71c8916850e44eecf4803a4786ace/3b61ef7113b61ef71c8978777a04315175b0047e2a3b?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "5e220302-f459-4d84-b3bb-2977c73df124"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B39E334",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3b61ef7103b61ef71c8916850e44eecf4803a4786ace/3b61ef7113b61ef71c8978777a04315175b0047e2a3b?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2cfe9970-32d1-4a33-9da2-52fd2022636a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3b61ef7103b61ef71c8916850e44eecf4803a4786ace/3b61ef7113b61ef71c8978777a04315175b0047e2a3b?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "0c9c15a9-66e9-4917-b39e-fab2077b7363"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B5489B0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=3b61ef71",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "108eb423-bbc6-44a0-99c3-42d4812a97f6"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/3b61ef7103b61ef71c8916850e44eecf4803a4786ace?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "abce44b8-3975-4fc1-9bea-a3e54ccde332"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "3b61ef7103b61ef71c8916850e44eecf4803a4786ace", "3b61ef7113b61ef71c8978777a04315175b0047e2a3b" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[1].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[1].json
index c3572fe3ea4b..4426d3ccf46f 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[1].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[1].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/adc2411d0adc2411d1ff907232c22debf1c79451a9b3?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d39f61ce-3463-4792-a0c2-22acf92ac366"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE978D6703",
       "Last-Modified" : "Wed, 05 May 2021 15:58:14 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/adc2411d0adc2411d1ff907232c22debf1c79451a9b3/adc2411d1adc2411d1ff9200528e7bde1e40241bbabb?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "81bed551-b7dc-4983-8e95-482383caf34f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE979DDB6A",
       "Last-Modified" : "Wed, 05 May 2021 15:58:15 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/adc2411d0adc2411d1ff907232c22debf1c79451a9b3/adc2411d1adc2411d1ff9200528e7bde1e40241bbabb?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "613666ae-6990-4b0a-b9e6-46e8c826ac45",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/adc2411d0adc2411d1ff907232c22debf1c79451a9b3/adc2411d1adc2411d1ff9200528e7bde1e40241bbabb?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cc64679b-0b43-4f4d-9789-73f3d2a222a4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE97B7B166",
       "Last-Modified" : "Wed, 05 May 2021 15:58:15 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=adc2411d",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "61bcc385-f287-48b0-94cd-43d2ba678473"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/adc2411d0adc2411d1ff907232c22debf1c79451a9b3?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "34329033-bd42-4d2e-95ed-9386461968d0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "adc2411d0adc2411d1ff907232c22debf1c79451a9b3", "adc2411d1adc2411d1ff9200528e7bde1e40241bbabb" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[2].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[2].json
index 6dd3c68d8790..39e252ce6c17 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[2].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[2].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/86ef12de086ef12de353199679647282b7faa431ca83?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "f698c752-bc60-4dd0-ba6d-e6b5db26a870"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE97E4E640",
       "Last-Modified" : "Wed, 05 May 2021 15:58:15 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/86ef12de086ef12de353199679647282b7faa431ca83/86ef12de186ef12de353032115cb2dc924d5b402e971?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "79bcf8d1-2f48-4ef3-bfc5-6b6dc84df2a0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE97F3E287",
       "Last-Modified" : "Wed, 05 May 2021 15:58:15 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/86ef12de086ef12de353199679647282b7faa431ca83/86ef12de186ef12de353032115cb2dc924d5b402e971?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "13139363-dcf7-4115-bd63-8efc27f3a76a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/86ef12de086ef12de353199679647282b7faa431ca83/86ef12de186ef12de353032115cb2dc924d5b402e971?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2e677835-1ec5-4147-b8bd-f5924fe93c1b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE980D9956",
       "Last-Modified" : "Wed, 05 May 2021 15:58:15 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=86ef12de",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "113de6b7-1bc6-4f35-9402-3a540ab46c51"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/86ef12de086ef12de353199679647282b7faa431ca83?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "b05683d1-47a5-46a1-8f00-c18409b5f868"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "86ef12de086ef12de353199679647282b7faa431ca83", "86ef12de186ef12de353032115cb2dc924d5b402e971" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[3].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[3].json
index 4e86d4b10a02..76e0041a03b1 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[3].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[3].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/9ff4239f09ff4239f965181699fa55a005ede4d46a59?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "b22c2845-7483-4d62-a02a-82fae3cf8385"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9837F9AF",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/9ff4239f09ff4239f965181699fa55a005ede4d46a59/9ff4239f19ff4239f96592341258394d2d9be482cb95?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cebf672d-f989-4282-ab82-456d24198252"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9846FF5E",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/9ff4239f09ff4239f965181699fa55a005ede4d46a59/9ff4239f19ff4239f96592341258394d2d9be482cb95?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "31fe88ab-b63f-433b-aaaf-a327fcda4588",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/9ff4239f09ff4239f965181699fa55a005ede4d46a59/9ff4239f19ff4239f96592341258394d2d9be482cb95?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "1080dac7-b61f-41a1-a771-d09cdf4c94d9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE986126E0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=9ff4239f",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "9feb5db0-24f2-4725-8097-722b0d0251bb"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/9ff4239f09ff4239f965181699fa55a005ede4d46a59?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "5d5d0225-f419-425f-a153-849b3b6f2e3c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "9ff4239f09ff4239f965181699fa55a005ede4d46a59", "9ff4239f19ff4239f96592341258394d2d9be482cb95" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[4].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[4].json
index 910f8bf5cf34..e70e38fb7a3b 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[4].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[4].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "99d66401-fa0b-4f23-b862-f102b447b631"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE988B6F14",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd/d0b5b5581d0b5b55829287207cae8dfb15a4242eb89d?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "0e4d22af-4246-45bd-b2c1-895ef32e5daf"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9899E4B5",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd/d0b5b5581d0b5b55829287207cae8dfb15a4242eb89d?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7e856dd2-f71f-4a7f-a43f-633dbf87f633",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd/d0b5b5581d0b5b55829287207cae8dfb15a4242eb89d?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "883ea2fb-96f5-478e-b5fe-0fabe4a1b39c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE98B54512",
       "Last-Modified" : "Wed, 05 May 2021 15:58:16 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=d0b5b558",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7753fa90-778f-45c7-8aa9-e0cc191b7304"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "00dae565-6ae3-456d-90af-117b8e0a99bb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "d0b5b5580d0b5b55829216185a3d43b76a4c746e98dd", "d0b5b5581d0b5b55829287207cae8dfb15a4242eb89d" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[5].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[5].json
index a0b6088c4d8c..4676702e7638 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[5].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[5].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/c9ae84190c9ae84191c553103b8d2e6ded60846cbadf?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "fd967e13-0cfc-41bb-ae5e-98f16e485ba0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE98E11239",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/c9ae84190c9ae84191c553103b8d2e6ded60846cbadf/c9ae84191c9ae84191c55433869663e32d50843a08d7?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d4ae80b1-18c3-4f42-aeb5-72849f2e85d2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE98F2B869",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/c9ae84190c9ae84191c553103b8d2e6ded60846cbadf/c9ae84191c9ae84191c55433869663e32d50843a08d7?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "38bc8c09-f112-4365-bede-a3040bbb3c74",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/c9ae84190c9ae84191c553103b8d2e6ded60846cbadf/c9ae84191c9ae84191c55433869663e32d50843a08d7?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "f314bb32-2f9f-438a-b60e-ae32de09f9ae"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE990CBE65",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=c9ae8419",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "71fea78a-a2ea-4a67-8327-51b187fee8a1"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/c9ae84190c9ae84191c553103b8d2e6ded60846cbadf?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "138eb2ca-f9ca-47a7-9932-07f89faaf230"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "c9ae84190c9ae84191c553103b8d2e6ded60846cbadf", "c9ae84191c9ae84191c55433869663e32d50843a08d7" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[6].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[6].json
index d80a863485b1..bd8506bb1d49 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[6].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[6].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/e283d7da0e283d7da4d57242841c62ea926a7438c924?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d948f5fa-36d5-4207-bed7-ff3809dc1262"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE99361C03",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/e283d7da0e283d7da4d57242841c62ea926a7438c924/e283d7da1e283d7da4d5964222e91193a174d472a985?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d145bc0b-a7f3-40bf-8d16-8a2822586f73"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE99468F04",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/e283d7da0e283d7da4d57242841c62ea926a7438c924/e283d7da1e283d7da4d5964222e91193a174d472a985?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "aa507476-3118-4295-9d83-416a58264111",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/e283d7da0e283d7da4d57242841c62ea926a7438c924/e283d7da1e283d7da4d5964222e91193a174d472a985?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "52092245-a2d1-4914-9395-d4fc686d93ba"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE995F44CC",
       "Last-Modified" : "Wed, 05 May 2021 15:58:17 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=e283d7da",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "20ef9d87-4425-40e7-8158-1ab2d8734012"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/e283d7da0e283d7da4d57242841c62ea926a7438c924?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7060a1bb-bb1e-4dfa-ab4c-0ab929e2340e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "e283d7da0e283d7da4d57242841c62ea926a7438c924", "e283d7da1e283d7da4d5964222e91193a174d472a985" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[7].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[7].json
index 82b9593963a0..a9f2e42b85f2 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[7].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[7].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/fb98e69b0fb98e69bb601307677648883123b4e5a93c?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "26579b0c-77a9-471b-813c-c1628691932d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE998D0163",
       "Last-Modified" : "Wed, 05 May 2021 15:58:18 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/fb98e69b0fb98e69bb601307677648883123b4e5a93c/fb98e69b1fb98e69bb60083730bdf07fa4a5b4b9c958?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "431193fa-b9b2-4631-82ec-28709d350a9d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE999BDCD6",
       "Last-Modified" : "Wed, 05 May 2021 15:58:18 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/fb98e69b0fb98e69bb601307677648883123b4e5a93c/fb98e69b1fb98e69bb60083730bdf07fa4a5b4b9c958?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "74f9369f-9923-4e28-9a5b-642c9d7635ee",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/fb98e69b0fb98e69bb601307677648883123b4e5a93c/fb98e69b1fb98e69bb60083730bdf07fa4a5b4b9c958?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c01165c3-120d-4d0e-991c-b785644fcdf0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE99B55164",
       "Last-Modified" : "Wed, 05 May 2021 15:58:18 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=fb98e69b",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "686284b9-d13b-4009-99d9-b60780156349"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/fb98e69b0fb98e69bb601307677648883123b4e5a93c?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ba95ab7f-1137-4e59-bf51-8af72de74cf4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "fb98e69b0fb98e69bb601307677648883123b4e5a93c", "fb98e69b1fb98e69bb60083730bdf07fa4a5b4b9c958" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[8].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[8].json
index afa26bfc791d..a21d6683babb 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[8].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[8].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "db2b790f-253d-4661-a7ee-b2191f2bbe59"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE99E0097D",
       "Last-Modified" : "Wed, 05 May 2021 15:58:18 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a/7c00fa5417c00fa542dc09240f67bf2f5ee074d21a11?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "35c5d02e-a962-4f2d-8532-77adb9df900d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE99EEE967",
       "Last-Modified" : "Wed, 05 May 2021 15:58:18 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a/7c00fa5417c00fa542dc09240f67bf2f5ee074d21a11?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "b8c9c46b-39f7-4847-8fd2-05210e9dc46a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a/7c00fa5417c00fa542dc09240f67bf2f5ee074d21a11?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ce3be098-b3c8-4373-8069-aae80c678a2e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A09394E",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=7c00fa54",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "b04cd80f-89ca-475d-9daf-1b6ea1445554"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "f6fb84ac-e46d-48ca-aff1-32b334dda689"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "7c00fa5407c00fa542dc7935395a536f0b8294ba7b8a", "7c00fa5417c00fa542dc09240f67bf2f5ee074d21a11" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[9].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[9].json
index 689ed28303cf..a2fb0ea209ed 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[9].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSignUserDelegationKey[9].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/651bcb150651bcb15ca727389dfef7f2887bb4a7da0d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "6dd94cdc-a4fd-4d9f-a75a-dd88918b0b37"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A366BCA",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/651bcb150651bcb15ca727389dfef7f2887bb4a7da0d/651bcb151651bcb15ca7480143fe759ef74e44825af4?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "55ce74b4-53c5-48cd-a7b6-adadd65ce2b9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A458D2F",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/651bcb150651bcb15ca727389dfef7f2887bb4a7da0d/651bcb151651bcb15ca7480143fe759ef74e44825af4?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "0413472b-8001-49ff-bbdf-0379ca75eeda",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/651bcb150651bcb15ca727389dfef7f2887bb4a7da0d/651bcb151651bcb15ca7480143fe759ef74e44825af4?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7223f886-8b7e-4400-b75e-0c9cc47ba035"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A5F2255",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=651bcb15",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "3431c8f0-0be4-4db4-b631-04f5bbb12b0f"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/651bcb150651bcb15ca727389dfef7f2887bb4a7da0d?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "db961a96-6e09-4dcf-8a8c-0a07cbba1913"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "651bcb150651bcb15ca727389dfef7f2887bb4a7da0d", "651bcb151651bcb15ca7480143fe759ef74e44825af4" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[0].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[0].json
index 45448df579e1..f6159e8afd79 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[0].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[0].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "5da8342a-1b36-44f8-a00c-dd0edd7f1fe6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A1FDBF3",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2/5b0bac7f15b0bac7fb0c664423fcaa1cf9da34a0ca2f?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "74acbca5-7a62-4678-9507-5fddefc3987c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A3177B3",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2/5b0bac7f15b0bac7fb0c664423fcaa1cf9da34a0ca2f?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2907355d-6306-4627-aca5-d4a7aa0123a0",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2/5b0bac7f15b0bac7fb0c664423fcaa1cf9da34a0ca2f?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "13cc82ac-3600-4569-bbcb-c2af49fe6411"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A4BCFC6",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=5b0bac7f",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "335235b8-dc6b-4bea-ab17-b021de72ff55"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c1879372-8301-4f91-a3d5-f2522bad7fe9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "5b0bac7f05b0bac7fb0c876331048ce07622c4d0cbe2", "5b0bac7f15b0bac7fb0c664423fcaa1cf9da34a0ca2f" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[1].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[1].json
index 1baf1f82d577..a69f53f0c000 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[1].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[1].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/42109d3e042109d3e00189216feba755dc2034491a8e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "1859e00c-cc18-47b6-a4e9-655100a9283e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A761E8F",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/42109d3e042109d3e00189216feba755dc2034491a8e/42109d3e142109d3e001961803ec75222deae43b0b17?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "cfe021e5-20d2-4234-8732-6bde4329a6ff"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A847F38",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/42109d3e042109d3e00189216feba755dc2034491a8e/42109d3e142109d3e001961803ec75222deae43b0b17?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d9c5b972-0cde-4ad1-a268-fbe7efbbae91",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/42109d3e042109d3e00189216feba755dc2034491a8e/42109d3e142109d3e001961803ec75222deae43b0b17?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "98f0d0b6-8a07-4906-b4a9-729c3fe7145b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A9E15E7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=42109d3e",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "3ab2d294-112b-47c3-8cf3-a4b89370e416"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/42109d3e042109d3e00189216feba755dc2034491a8e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "fc3650da-57fe-4be6-8037-46cefbfe64bd"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "42109d3e042109d3e00189216feba755dc2034491a8e", "42109d3e142109d3e001961803ec75222deae43b0b17" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[2].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[2].json
index 13c0a689c1f4..67f0f2c1face 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[2].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[2].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/693dcefd0693dcefddc984277c3e69943de7845599f9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "21c87913-4c8c-40fd-8717-4e824e959598"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A89425E",
       "Last-Modified" : "Wed, 05 May 2021 15:58:19 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/693dcefd0693dcefddc984277c3e69943de7845599f9/693dcefd1693dcefddc967077dc915d4d404a43e8ba2?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ff99ea2c-42f6-42b4-abed-e4b8169f2a51"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9A9878F7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/693dcefd0693dcefddc984277c3e69943de7845599f9/693dcefd1693dcefddc967077dc915d4d404a43e8ba2?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "00dc1fae-d7e4-4b2a-86d5-94e3513406f4",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/693dcefd0693dcefddc984277c3e69943de7845599f9/693dcefd1693dcefddc967077dc915d4d404a43e8ba2?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "6ef88df6-8e50-4548-8988-02ebe0ba0d1a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AB36D10",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=693dcefd",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "3eb519d8-973f-4139-aafe-d04c523df0cb"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/693dcefd0693dcefddc984277c3e69943de7845599f9?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "913d2ceb-1115-4e65-9e07-faa317a296a8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "693dcefd0693dcefddc984277c3e69943de7845599f9", "693dcefd1693dcefddc967077dc915d4d404a43e8ba2" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[3].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[3].json
index a00a70dd468a..ac767318acfb 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[3].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[3].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/7026ffbc07026ffbc35b68496c42db62d183448a98d6?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "8e34a3e1-a871-40eb-8533-8ae6eb1c9534"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9ADE076E",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7026ffbc07026ffbc35b68496c42db62d183448a98d6/7026ffbc17026ffbc35b90478ed2568ac57f14b0c91f?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "9a0babe4-17b0-4347-9eec-2e7937613fd0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9AED8267",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7026ffbc07026ffbc35b68496c42db62d183448a98d6/7026ffbc17026ffbc35b90478ed2568ac57f14b0c91f?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "aeb4a642-927c-473e-9fa0-e8d33bcd453b",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/7026ffbc07026ffbc35b68496c42db62d183448a98d6/7026ffbc17026ffbc35b90478ed2568ac57f14b0c91f?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "bced5217-ef4b-4a54-a1c6-aa9143b38740"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B09493B",
       "Last-Modified" : "Wed, 05 May 2021 15:58:20 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=7026ffbc",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "79ed08fd-e661-417c-9035-f929b314bd55"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/7026ffbc07026ffbc35b68496c42db62d183448a98d6?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7eb6d34d-9556-4a4a-8ed5-99f3e1a6f1d1"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "7026ffbc07026ffbc35b68496c42db62d183448a98d6", "7026ffbc17026ffbc35b90478ed2568ac57f14b0c91f" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[4].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[4].json
index 5e9305c283c7..c246ab1a8722 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[4].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[4].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/3f67697b03f67697bb5801312315e054023a54180a65?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7aefa999-f404-4680-8e9e-cbab988c55a4"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B31FBD7",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3f67697b03f67697bb5801312315e054023a54180a65/3f67697b13f67697bb5857848970529988d3d417aa39?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "416e524f-3467-42f5-a55e-7e5549f187e3"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B4B8CAF",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3f67697b03f67697bb5801312315e054023a54180a65/3f67697b13f67697bb5857848970529988d3d417aa39?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "fd3c8c4f-2167-4da0-a6f3-bde7d149c3eb",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/3f67697b03f67697bb5801312315e054023a54180a65/3f67697b13f67697bb5857848970529988d3d417aa39?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "1d9eb2aa-083d-431a-8ae9-099fbb2ff6ad"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B6721DB",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=3f67697b",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "2cd62494-ce50-4a55-ac31-52ec21f6133d"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/3f67697b03f67697bb5801312315e054023a54180a65?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "7884fb0f-23fb-4f0d-84fa-e3b1e27f3824"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "3f67697b03f67697bb5801312315e054023a54180a65", "3f67697b13f67697bb5857848970529988d3d417aa39" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[5].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[5].json
index 09c6729b72e8..7347d8ba47fe 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[5].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[5].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/267c583a0267c583a05a25266a60c774daaf94912b2e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "108b5089-e0d4-4f6b-b06b-aab54bb0676a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B46EADB",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/267c583a0267c583a05a25266a60c774daaf94912b2e/267c583a1267c583a05a25615a38f794f523f4f3fa95?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ce72a21c-0607-49fa-a986-f6b2d78525aa"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B599472",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/267c583a0267c583a05a25266a60c774daaf94912b2e/267c583a1267c583a05a25615a38f794f523f4f3fa95?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "6e596cc2-eb42-4fd7-9128-d671a2fa0821",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/267c583a0267c583a05a25266a60c774daaf94912b2e/267c583a1267c583a05a25615a38f794f523f4f3fa95?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "0cc38ebc-5330-47a9-88cf-90cd3ca97fea"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B72B547",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=267c583a",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "90c98099-540e-4215-98b6-66ef9dea51a3"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/267c583a0267c583a05a25266a60c774daaf94912b2e?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "672f2eb6-725f-439f-9917-4d3a96b1f237"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "267c583a0267c583a05a25266a60c774daaf94912b2e", "267c583a1267c583a05a25615a38f794f523f4f3fa95" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[6].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[6].json
index 5d5182afea83..d3278d8cbced 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[6].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[6].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/0d510bf900d510bf925484953eebf0b008a5b443da83?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ba797e3e-1372-4f85-992c-d91fe261d8cb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B90AA9F",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/0d510bf900d510bf925484953eebf0b008a5b443da83/0d510bf910d510bf925433547f456fa7150f04637ae7?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "ca35505e-b7c9-4165-8ade-0da673a8e2c1"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BA00AB3",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/0d510bf900d510bf925484953eebf0b008a5b443da83/0d510bf910d510bf925433547f456fa7150f04637ae7?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "e2b903f5-943c-48f4-aff3-97697341605a",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/0d510bf900d510bf925484953eebf0b008a5b443da83/0d510bf910d510bf925433547f456fa7150f04637ae7?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "30ef93d4-7fa1-4322-89ba-9a8fba6c035f"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BBAE2D9",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=0d510bf9",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "4b8b07a9-4859-42ed-974b-07235bb267b7"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/0d510bf900d510bf925484953eebf0b008a5b443da83?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "45aeeea3-54b9-470f-a56a-cb45faf6a26a"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "0d510bf900d510bf925484953eebf0b008a5b443da83", "0d510bf910d510bf925433547f456fa7150f04637ae7" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[7].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[7].json
index 963133a258b8..59d86cf7e479 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[7].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[7].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/144a3ab80144a3ab83b128239ff79926ffa954b40a13?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "3d1edcce-55e0-4a08-9e3a-f8c98f28dcbc"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9B9BABE0",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/144a3ab80144a3ab83b128239ff79926ffa954b40a13/144a3ab81144a3ab83b1524190452eba412da44ffa77?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c86f8944-0675-4744-83dc-ec9bb79a1dc3"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BAAF12E",
       "Last-Modified" : "Wed, 05 May 2021 15:58:21 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/144a3ab80144a3ab83b128239ff79926ffa954b40a13/144a3ab81144a3ab83b1524190452eba412da44ffa77?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "1af33730-4329-4fd3-ad18-19e6a5bcfdc6",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/144a3ab80144a3ab83b128239ff79926ffa954b40a13/144a3ab81144a3ab83b1524190452eba412da44ffa77?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "670e9873-a589-4050-b444-2208d27782e1"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BC473EB",
       "Last-Modified" : "Wed, 05 May 2021 15:58:22 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=144a3ab8",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "daceb912-eba4-4ee3-b452-2268a2565ec9"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/144a3ab80144a3ab83b128239ff79926ffa954b40a13?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "872a9194-907f-4873-b31e-6d928527a922"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "144a3ab80144a3ab83b128239ff79926ffa954b40a13", "144a3ab81144a3ab83b1524190452eba412da44ffa77" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[8].json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[8].json
index e1a362ad6cea..7b8c08db7ec1 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[8].json
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/SASTestSasImplUtilStringToSign[8].json
@@ -3,13 +3,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.blob.core.windows.net/93d22677093d2267747921480ab11a60d9bc4422bad1?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "47ea9290-ed9c-4f0b-b43f-e35302182cf0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BE1FCCF",
       "Last-Modified" : "Wed, 05 May 2021 15:58:22 GMT",
@@ -24,13 +24,13 @@
     "Method" : "PUT",
     "Uri" : "https://REDACTED.dfs.core.windows.net/93d22677093d2267747921480ab11a60d9bc4422bad1/93d22677193d22677479237121ac6edd50e0f439a9e1?resource=file",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "d4825e1a-9cb5-46c6-b783-792ba974fbcb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9BF07D66",
       "Last-Modified" : "Wed, 05 May 2021 15:58:22 GMT",
@@ -46,14 +46,14 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/93d22677093d2267747921480ab11a60d9bc4422bad1/93d22677193d22677479237121ac6edd50e0f439a9e1?action=append&position=0",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "c438a895-fd34-4259-9b03-45d66ee22f00",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -67,13 +67,13 @@
     "Method" : "PATCH",
     "Uri" : "https://REDACTED.dfs.core.windows.net/93d22677093d2267747921480ab11a60d9bc4422bad1/93d22677193d22677479237121ac6edd50e0f439a9e1?action=flush&position=7&retainUncommittedData=false&close=false",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "fe2005b5-b471-4619-8a72-f5d7e9643818"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
       "eTag" : "0x8D90FDE9C0B8F07",
       "Last-Modified" : "Wed, 05 May 2021 15:58:22 GMT",
@@ -89,13 +89,13 @@
     "Method" : "GET",
     "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=93d22677",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "e5fa720d-fd67-41c0-812d-ddb0f59b28b7"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
@@ -110,13 +110,13 @@
     "Method" : "DELETE",
     "Uri" : "https://REDACTED.blob.core.windows.net/93d22677093d2267747921480ab11a60d9bc4422bad1?restype=container",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.1 azsdk-java-azure-storage-file-datalake/12.6.0-beta.1 (11.0.8; Windows 10; 10.0)",
       "x-ms-client-request-id" : "91933eb3-aa05-4083-9021-dd867a1b0667"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
@@ -127,4 +127,4 @@
     "Exception" : null
   } ],
   "variables" : [ "93d22677093d2267747921480ab11a60d9bc4422bad1", "93d22677193d22677479237121ac6edd50e0f439a9e1" ]
-}
\ No newline at end of file
+}
diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md
index 9f5b683fa67d..1163fd82ca90 100644
--- a/sdk/storage/azure-storage-file-share/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md
@@ -1,8 +1,7 @@
 # Release History
 
 ## 12.10.0-beta.2 (Unreleased)
-
-
+- Added support for the 2020-10-02 service version.
 
 ## 12.10.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
index 65576354f57f..b383bb3e4a59 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
@@ -16,7 +16,8 @@ public enum ShareServiceVersion implements ServiceVersion {
     V2020_02_10("2020-02-10"),
     V2020_04_08("2020-04-08"),
     V2020_06_12("2020-06-12"),
-    V2020_08_04("2020-08-04");
+    V2020_08_04("2020-08-04"),
+    V2020_10_02("2020-10-02");
 
     private final String version;
 
@@ -38,6 +39,6 @@ public String getVersion() {
      * @return the latest {@link ShareServiceVersion}
      */
     public static ShareServiceVersion getLatest() {
-        return V2020_08_04;
+        return V2020_10_02;
     }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkAccountSasTokenOnEndpoint.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkAccountSasTokenOnEndpoint.json
index de63da58f0af..bab1485de010 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkAccountSasTokenOnEndpoint.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkAccountSasTokenOnEndpoint.json
@@ -1,129 +1,89 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471a3912159420b2dc47f2244a7dba?restype=share&sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471aae520858956f6ea6164743b6b6?restype=share&sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4fe2d9f5-9377-4078-abb2-68c20fb9b6a0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8a81f872-e74f-48c9-82f4-758a365bcdb7"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672CDD1ED",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1BF1CD",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "dfc51a98-901a-0074-3cff-41fe41000000",
-      "x-ms-client-request-id" : "4fe2d9f5-9377-4078-abb2-68c20fb9b6a0",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
+      "x-ms-request-id" : "21b55f17-801a-0058-2406-49029d000000",
+      "x-ms-client-request-id" : "8a81f872-e74f-48c9-82f4-758a365bcdb7",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471a3912159420b2dc47f2244a7dba/d046471ad046471a3916124303e67f5fcf1d44b5b9?sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471aae520858956f6ea6164743b6b6/d046471ad046471aae573874fb5fc5641e734c5aa9?sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "511043ef-109b-4e4a-8eee-82ac9208e093"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4ec1214d-060e-4ff4-b91a-e4f6c6ae417d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.3011358Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3930423Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.3011358Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3930423Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EBB79E",
-      "x-ms-request-id" : "ebffcf67-301a-000f-59ff-41bcdd000000",
-      "x-ms-client-request-id" : "511043ef-109b-4e4a-8eee-82ac9208e093",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.3011358Z"
+      "eTag" : "0x8D9171DCB6B4237",
+      "x-ms-request-id" : "60b0d40d-f01a-0089-4006-496017000000",
+      "x-ms-client-request-id" : "4ec1214d-060e-4ff4-b91a-e4f6c6ae417d",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3930423Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471a3912159420b2dc47f2244a7dba/d046471ad046471a3916124303e67f5fcf1d44b5b9?sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471aae520858956f6ea6164743b6b6/d046471ad046471aae573874fb5fc5641e734c5aa9?sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=rc&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "957c8cd4-dee4-476d-a26f-6de21474b5fb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e3ac9a59-be59-4940-a397-6bc85e642a1a"
     },
     "Response" : {
       "content-length" : "1024",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.3011358Z",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3930423Z",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-type" : "File",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.3011358Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3930423Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EBB79E",
-      "x-ms-request-id" : "dfc67a68-c01a-0046-1fff-41fe36000000",
+      "eTag" : "0x8D9171DCB6B4237",
+      "x-ms-request-id" : "5ac80bd6-801a-0077-6206-490f56000000",
       "Body" : "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-      "x-ms-client-request-id" : "957c8cd4-dee4-476d-a26f-6de21474b5fb",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.3011358Z",
+      "x-ms-client-request-id" : "e3ac9a59-be59-4940-a397-6bc85e642a1a",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3930423Z",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=d046471a&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0c1ed686-a2a3-4907-b04a-edb07287905d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "ea010c01-801a-0035-7aff-41a6a5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>d046471a</Prefix><Shares><Share><Name>d046471ad046471a3912159420b2dc47f2244a7dba</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672CDD1ED\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "0c1ed686-a2a3-4907-b04a-edb07287905d",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/d046471ad046471a3912159420b2dc47f2244a7dba?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "29d55140-b45a-4735-96aa-4fb71585492d"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "ebffcf6c-301a-000f-5cff-41bcdd000000",
-      "x-ms-client-request-id" : "29d55140-b45a-4735-96aa-4fb71585492d",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "d046471ad046471a391382832eae4fb810a14c1393", "2021-05-05T22:38:02.624123200Z", "d046471ad046471a3912159420b2dc47f2244a7dba", "d046471ad046471a3916124303e67f5fcf1d44b5b9" ]
+  "variables" : [ "d046471ad046471aae5734194bccff72bbfc45b798", "2021-05-14T21:18:14.315055200Z", "d046471ad046471aae520858956f6ea6164743b6b6", "d046471ad046471aae573874fb5fc5641e734c5aa9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkCreateDeleteShare.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkCreateDeleteShare.json
index f454cbeb0d76..41cbbd1ca1d3 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkCreateDeleteShare.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsAccountSASNetworkCreateDeleteShare.json
@@ -1,65 +1,44 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/b05e8148b05e81480ae696692bfe3ee5e4a0403fad?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/b05e8148b05e814866f324032060c79f1cd34b5b8d?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3f5e199f-685a-47b8-8160-c2dcffaf0cbb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4ef2a029-d8c2-4d5d-97e5-a162c33f13d8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C76A35",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1C2EA3",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "9b3ae85f-601a-005f-76ff-417e8d000000",
-      "x-ms-client-request-id" : "3f5e199f-685a-47b8-8160-c2dcffaf0cbb",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "92b5c1dd-f01a-0099-0406-49a57f000000",
+      "x-ms-client-request-id" : "4ef2a029-d8c2-4d5d-97e5-a162c33f13d8",
+      "Date" : "Fri, 14 May 2021 21:18:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/b05e8148b05e81480ae696692bfe3ee5e4a0403fad?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/b05e8148b05e814866f324032060c79f1cd34b5b8d?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ecb7411f-65c7-4b18-8ab3-40d58a638784"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0d87636a-ecf4-4734-9b52-99d0cce9bc3b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "6066e4c9-401a-0077-70ff-411f25000000",
-      "x-ms-client-request-id" : "ecb7411f-65c7-4b18-8ab3-40d58a638784",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=b05e8148&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1e5c03fb-2972-4f2e-9a45-534c543ce280"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "978062ed-301a-0042-0eff-417331000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>b05e8148</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "1e5c03fb-2972-4f2e-9a45-534c543ce280",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
+      "x-ms-request-id" : "5ac80bd3-801a-0077-6006-490f56000000",
+      "x-ms-client-request-id" : "0d87636a-ecf4-4734-9b52-99d0cce9bc3b",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "b05e8148b05e81480ae79327626ba81a1e484221b2", "2021-05-05T22:38:02.624123200Z", "b05e8148b05e81480ae696692bfe3ee5e4a0403fad" ]
+  "variables" : [ "b05e8148b05e814866f3460443bfcc1eedf0477f8e", "2021-05-14T21:18:14.297057300Z", "b05e8148b05e814866f324032060c79f1cd34b5b8d" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsCanUseSasToAuthenticate.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsCanUseSasToAuthenticate.json
index 2ba31fd817eb..ab5e0a48daac 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsCanUseSasToAuthenticate.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsCanUseSasToAuthenticate.json
@@ -1,328 +1,288 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c2d1b804-d161-47d0-8cfc-0cd4c0c6db86"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "239e6b24-f2ed-41cc-af28-546dcdab1315"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C82B24",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1C5B88",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "a8752f3c-b01a-0001-01ff-41956d000000",
-      "x-ms-client-request-id" : "c2d1b804-d161-47d0-8cfc-0cd4c0c6db86",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "c03d9008-201a-007e-6d06-494a85000000",
+      "x-ms-client-request-id" : "239e6b24-f2ed-41cc-af28-546dcdab1315",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae/13693885013693885ace0172525e4cbda475340afbfd?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97/136938850136938858a7369264534c3c590ed4456965?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b2fd42a5-2c0e-4f18-ae94-594a26022246"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "67fec047-e65b-4f2b-b16e-32104cdf4c5e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2621078Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3199897Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2621078Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3199897Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672E5C316",
-      "x-ms-request-id" : "978062eb-301a-0042-0dff-417331000000",
-      "x-ms-client-request-id" : "b2fd42a5-2c0e-4f18-ae94-594a26022246",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2621078Z"
+      "eTag" : "0x8D9171DCB601C99",
+      "x-ms-request-id" : "db5f14c8-e01a-0013-7e06-49fece000000",
+      "x-ms-client-request-id" : "67fec047-e65b-4f2b-b16e-32104cdf4c5e",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3199897Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "567d56ff-c396-43f3-866b-127177206c05"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "17f0935b-8e03-4987-80fa-dd1cacd1c864"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
-      "x-ms-access-tier-change-time" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-access-tier-change-time" : "Fri, 14 May 2021 21:18:17 GMT",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-share-quota" : "5120",
       "x-ms-access-tier" : "TransactionOptimized",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D9101672C82B24",
-      "x-ms-request-id" : "ad0f9a48-401a-0067-69ff-41da4d000000",
-      "x-ms-client-request-id" : "567d56ff-c396-43f3-866b-127177206c05"
+      "eTag" : "0x8D9171DCB1C5B88",
+      "x-ms-request-id" : "60b0d410-f01a-0089-4106-496017000000",
+      "x-ms-client-request-id" : "17f0935b-8e03-4987-80fa-dd1cacd1c864"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5d2df3d6-015d-4d30-b050-626eb37cfc0e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "97064340-d778-49c1-a86c-4bf8ceeae5b8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
-      "x-ms-access-tier-change-time" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-access-tier-change-time" : "Fri, 14 May 2021 21:18:17 GMT",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-share-quota" : "5120",
       "x-ms-access-tier" : "TransactionOptimized",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D9101672C82B24",
-      "x-ms-request-id" : "ad0f9a4a-401a-0067-6aff-41da4d000000",
-      "x-ms-client-request-id" : "5d2df3d6-015d-4d30-b050-626eb37cfc0e"
+      "eTag" : "0x8D9171DCB1C5B88",
+      "x-ms-request-id" : "5ac80bd8-801a-0077-6306-490f56000000",
+      "x-ms-client-request-id" : "97064340-d778-49c1-a86c-4bf8ceeae5b8"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae?restype=share&sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97?restype=share&sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a1763ca4-42dc-4aa7-b852-4b029dd9f156"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b74e6b57-92b0-4f86-addf-dda6c7439891"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
-      "x-ms-access-tier-change-time" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-access-tier-change-time" : "Fri, 14 May 2021 21:18:17 GMT",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-share-quota" : "5120",
       "x-ms-access-tier" : "TransactionOptimized",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D9101672C82B24",
-      "x-ms-request-id" : "a8752f41-b01a-0001-04ff-41956d000000",
-      "x-ms-client-request-id" : "a1763ca4-42dc-4aa7-b852-4b029dd9f156"
+      "eTag" : "0x8D9171DCB1C5B88",
+      "x-ms-request-id" : "5ac80bda-801a-0077-6406-490f56000000",
+      "x-ms-client-request-id" : "b74e6b57-92b0-4f86-addf-dda6c7439891"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae/13693885013693885ace0172525e4cbda475340afbfd?restype=directory&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97/136938850136938858a7369264534c3c590ed4456965?restype=directory&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fb9341ac-444a-4d66-86b0-552d45a7d242"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "480eca06-e5e5-4af8-8d4d-e2a3b42342d0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2621078Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3199897Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-server-encrypted" : "true",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2621078Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3199897Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672E5C316",
-      "x-ms-request-id" : "a8752f46-b01a-0001-09ff-41956d000000",
-      "x-ms-client-request-id" : "fb9341ac-444a-4d66-86b0-552d45a7d242",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2621078Z"
+      "eTag" : "0x8D9171DCB601C99",
+      "x-ms-request-id" : "8fa71bb8-c01a-002b-0c06-495a0e000000",
+      "x-ms-client-request-id" : "480eca06-e5e5-4af8-8d4d-e2a3b42342d0",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3199897Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae/13693885013693885ace0172525e4cbda475340afbfd?restype=directory&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97/136938850136938858a7369264534c3c590ed4456965?restype=directory&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2fbbdff4-a856-43b1-8f20-5f4fb2b27257"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5334e5d3-17f8-491e-90d6-96827b2ec3d6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2621078Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3199897Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-server-encrypted" : "true",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2621078Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3199897Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672E5C316",
-      "x-ms-request-id" : "dfc67a6e-c01a-0046-23ff-41fe36000000",
-      "x-ms-client-request-id" : "2fbbdff4-a856-43b1-8f20-5f4fb2b27257",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2621078Z"
+      "eTag" : "0x8D9171DCB601C99",
+      "x-ms-request-id" : "9d39c9d6-301a-0096-3406-49d313000000",
+      "x-ms-client-request-id" : "5334e5d3-17f8-491e-90d6-96827b2ec3d6",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3199897Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae/13693885013693885ace0172525e4cbda475340afbfd?restype=directory&sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/13693885136938858a78332336b882503ef449af97/136938850136938858a7369264534c3c590ed4456965?restype=directory&sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "973fdb85-cfda-4bb1-bc41-0fa81f6e8aa5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e68f7e9d-f06a-422d-acb5-6abf11d1eef6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2621078Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3199897Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-server-encrypted" : "true",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2621078Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3199897Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672E5C316",
-      "x-ms-request-id" : "978062f2-301a-0042-13ff-417331000000",
-      "x-ms-client-request-id" : "973fdb85-cfda-4bb1-bc41-0fa81f6e8aa5",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2621078Z"
+      "eTag" : "0x8D9171DCB601C99",
+      "x-ms-request-id" : "8fa71bbb-c01a-002b-0e06-495a0e000000",
+      "x-ms-client-request-id" : "e68f7e9d-f06a-422d-acb5-6abf11d1eef6",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3199897Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6daaae32-96ec-42bf-bf42-94fb1da53b2e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cd138e72-c8b9-4e22-9faf-b13d53b55b90"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "a8752f47-b01a-0001-0aff-41956d000000",
+      "x-ms-request-id" : "8fa71bc5-c01a-002b-0f06-495a0e000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /><ProtocolSettings><SMB><Multichannel><Enabled>false</Enabled></Multichannel></SMB></ProtocolSettings></StorageServiceProperties>",
-      "x-ms-client-request-id" : "6daaae32-96ec-42bf-bf42-94fb1da53b2e",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-client-request-id" : "cd138e72-c8b9-4e22-9faf-b13d53b55b90",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f30b2c9a-63ae-4a3e-84df-62ac897930d5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7382fc3b-cafd-49e8-b5d3-31596956c262"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "ad0f9a50-401a-0067-70ff-41da4d000000",
+      "x-ms-request-id" : "8fa71bc6-c01a-002b-1006-495a0e000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /><ProtocolSettings><SMB><Multichannel><Enabled>false</Enabled></Multichannel></SMB></ProtocolSettings></StorageServiceProperties>",
-      "x-ms-client-request-id" : "f30b2c9a-63ae-4a3e-84df-62ac897930d5",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-client-request-id" : "7382fc3b-cafd-49e8-b5d3-31596956c262",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-08-04&se=2021-05-06T22%3A38%3A02Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-10-02&se=2021-05-15T21%3A18%3A14Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "eb77d619-d2bf-4f01-a231-c991797d959e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cf617b83-b3a8-4825-90c5-e7723c05191a"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "ebffcf74-301a-000f-63ff-41bcdd000000",
+      "x-ms-request-id" : "8fa71bc7-c01a-002b-1106-495a0e000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /><ProtocolSettings><SMB><Multichannel><Enabled>false</Enabled></Multichannel></SMB></ProtocolSettings></StorageServiceProperties>",
-      "x-ms-client-request-id" : "eb77d619-d2bf-4f01-a231-c991797d959e",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-client-request-id" : "cf617b83-b3a8-4825-90c5-e7723c05191a",
+      "Date" : "Fri, 14 May 2021 21:18:19 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=13693885&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7ffaa449-6e66-4366-9c87-02f31e6697b5"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "dfc67a70-c01a-0046-24ff-41fe36000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>13693885</Prefix><Shares><Share><Name>1369388513693885ace41971a326d7db6674411cae</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C82B24\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "7ffaa449-6e66-4366-9c87-02f31e6697b5",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/1369388513693885ace41971a326d7db6674411cae?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1213dda5-f3ad-44d9-a388-96e341fa6f3d"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "9b3ae86c-601a-005f-7eff-417e8d000000",
-      "x-ms-client-request-id" : "1213dda5-f3ad-44d9-a388-96e341fa6f3d",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "1369388513693885ace41971a326d7db6674411cae", "2021-05-05T22:38:02.623122600Z", "13693885013693885ace0172525e4cbda475340afbfd" ]
+  "variables" : [ "13693885136938858a78332336b882503ef449af97", "2021-05-14T21:18:14.294059Z", "136938850136938858a7369264534c3c590ed4456965" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestDownloadUpload.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestDownloadUpload.json
index 1a7e97bf9211..b32678ab2db3 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestDownloadUpload.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestDownloadUpload.json
@@ -1,181 +1,141 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51c8fe02217515300f27caf453bab?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "946a20b1-fef9-400d-9f26-2d42a3a2a25a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "206bcef7-082a-4f37-a577-4cd54562142b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C77FD7",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1D13CB",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ebffcf64-301a-000f-58ff-41bcdd000000",
-      "x-ms-client-request-id" : "946a20b1-fef9-400d-9f26-2d42a3a2a25a",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "8fa71bb1-c01a-002b-0806-495a0e000000",
+      "x-ms-client-request-id" : "206bcef7-082a-4f37-a577-4cd54562142b",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51c8fe02217515300f27caf453bab/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c10a4aa0-5dba-46b9-831b-823cf8e26dda"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1cc7ca73-d1bd-4b73-91a2-a7f9f89e3a20"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2951324Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.5281376Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2951324Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.5281376Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EACD1C",
-      "x-ms-request-id" : "802251c9-701a-006c-23ff-412126000000",
-      "x-ms-client-request-id" : "c10a4aa0-5dba-46b9-831b-823cf8e26dda",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2951324Z"
+      "eTag" : "0x8D9171DCB7FDF60",
+      "x-ms-request-id" : "9d39c9ca-301a-0096-2d06-49d313000000",
+      "x-ms-client-request-id" : "1cc7ca73-d1bd-4b73-91a2-a7f9f89e3a20",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.5281376Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2/filename?comp=range",
+    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51c8fe02217515300f27caf453bab/filename?comp=range",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f1543a39-825e-461d-b453-82821834067a",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "40d29816-02e7-4c8d-b809-dfc76a86b76d",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672FD952C",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB8C3DB7",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "802251cd-701a-006c-26ff-412126000000",
+      "x-ms-request-id" : "9d39c9cf-301a-0096-2f06-49d313000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "f1543a39-825e-461d-b453-82821834067a",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "x-ms-client-request-id" : "40d29816-02e7-4c8d-b809-dfc76a86b76d",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g=="
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2/filename?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51c8fe02217515300f27caf453bab/filename?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A18%3A18Z&se=2021-05-15T21%3A18%3A18Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0084455b-2de4-42eb-ab65-9fc65fd89cf6"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5daad1d3-5e87-4693-9e9b-a2a504427409"
     },
     "Response" : {
       "content-length" : "1024",
       "x-ms-lease-status" : "unlocked",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2951324Z",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.5281376Z",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-file-attributes" : "Archive",
-      "eTag" : "0x8D9101672FD952C",
+      "eTag" : "0x8D9171DCB8C3DB7",
       "Content-Length" : "1024",
-      "x-ms-request-id" : "ebffcf6b-301a-000f-5bff-41bcdd000000",
+      "x-ms-request-id" : "9d39c9d1-301a-0096-3106-49d313000000",
       "Body" : "test\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
       "Content-Type" : "type",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-type" : "File",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2951324Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.5281376Z",
       "x-ms-file-parent-id" : "0",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "0084455b-2de4-42eb-ab65-9fc65fd89cf6",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2951324Z"
+      "x-ms-client-request-id" : "5daad1d3-5e87-4693-9e9b-a2a504427409",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.5281376Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2/filename?comp=range&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51c8fe02217515300f27caf453bab/filename?comp=range&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A18%3A18Z&se=2021-05-15T21%3A18%3A18Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "edb61c56-032e-49d2-aea2-f0a295558d66",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "774172cd-ccfc-4e38-839e-620814b54e86",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101673191170",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCBB0E35E",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6066e4cc-401a-0077-73ff-411f25000000",
+      "x-ms-request-id" : "60b0d415-f01a-0089-4406-496017000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "edb61c56-032e-49d2-aea2-f0a295558d66",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-client-request-id" : "774172cd-ccfc-4e38-839e-620814b54e86",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g=="
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=3b7fd51c&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8b0b764d-b1d5-4ee6-a18f-0cd9ddcc89c6"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "978062f0-301a-0042-11ff-417331000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>3b7fd51c</Prefix><Shares><Share><Name>3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C77FD7\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "8b0b764d-b1d5-4ee6-a18f-0cd9ddcc89c6",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ad0978a5-0ed1-4ea0-a559-69c32df9c588"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "802251d3-701a-006c-2bff-412126000000",
-      "x-ms-client-request-id" : "ad0978a5-0ed1-4ea0-a559-69c32df9c588",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "3b7fd51c3b7fd51cc955894670a93fc87dbc4873a2", "2021-05-05T22:38:05.615036900Z", "2021-05-05T22:38:05.616038600Z" ]
+  "variables" : [ "3b7fd51c3b7fd51c8fe02217515300f27caf453bab", "2021-05-14T21:18:18.741644900Z", "2021-05-14T21:18:18.741644900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestUploadFails.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestUploadFails.json
index 07dda62d937a..baedb8a9fe52 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestUploadFails.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASNetworkTestUploadFails.json
@@ -1,136 +1,96 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff1227976866389edb9c8f7f54b4c82?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff122ffa8391528d659a3507b4697b1?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "dba0dbd2-5de2-421e-9535-b45ed630bf78"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8c194874-ed94-4f71-b0bb-d8c7705daf10"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C78E6E",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1EE33C",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "dfc67a63-c01a-0046-1dff-41fe36000000",
-      "x-ms-client-request-id" : "dba0dbd2-5de2-421e-9535-b45ed630bf78",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "5c910721-501a-0090-1906-49e0ac000000",
+      "x-ms-client-request-id" : "8c194874-ed94-4f71-b0bb-d8c7705daf10",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff1227976866389edb9c8f7f54b4c82/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff122ffa8391528d659a3507b4697b1/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ae2409e9-03c0-4bd3-a49d-a654d43035df"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a88334b3-26ec-4d7d-a66f-4b7071298b9c"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2981343Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.3790319Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2981343Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.3790319Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EB425F",
-      "x-ms-request-id" : "9b3ae862-601a-005f-77ff-417e8d000000",
-      "x-ms-client-request-id" : "ae2409e9-03c0-4bd3-a49d-a654d43035df",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2981343Z"
+      "eTag" : "0x8D9171DCB691EEF",
+      "x-ms-request-id" : "29f37873-201a-0023-5a06-494001000000",
+      "x-ms-client-request-id" : "a88334b3-26ec-4d7d-a66f-4b7071298b9c",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.3790319Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff1227976866389edb9c8f7f54b4c82/filename?comp=range&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff122ffa8391528d659a3507b4697b1/filename?comp=range&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A18%3A18Z&se=2021-05-15T21%3A18%3A18Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6c7b7243-565b-418e-a566-344e13dffaea",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "56e95cc9-05f5-4f80-9335-c2b518eee481",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "dfc51a9d-901a-0074-3eff-41fe41000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:dfc51a9d-901a-0074-3eff-41fe41000000\nTime:2021-05-05T22:38:05.4314320Z</Message></Error>",
-      "x-ms-client-request-id" : "6c7b7243-565b-418e-a566-344e13dffaea",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-request-id" : "db5f14cc-e01a-0013-8006-49fece000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:db5f14cc-e01a-0013-8006-49fece000000\nTime:2021-05-14T21:18:18.5499237Z</Message></Error>",
+      "x-ms-client-request-id" : "56e95cc9-05f5-4f80-9335-c2b518eee481",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff1227976866389edb9c8f7f54b4c82/filename?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff122ffa8391528d659a3507b4697b1/filename?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A18%3A18Z&se=2021-05-15T21%3A18%3A18Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "29ec7b32-715e-4812-a41b-cf5d4bcb3542"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "49779e27-0367-4073-b9e9-238c21c3bf1d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "9b3ae866-601a-005f-79ff-417e8d000000",
-      "x-ms-client-request-id" : "29ec7b32-715e-4812-a41b-cf5d4bcb3542",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=05bff122&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7a584dff-c199-4714-8883-8c732a09ffc8"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "ea010c04-801a-0035-7bff-41a6a5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>05bff122</Prefix><Shares><Share><Name>05bff12205bff1227976866389edb9c8f7f54b4c82</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C78E6E\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "7a584dff-c199-4714-8883-8c732a09ffc8",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/05bff12205bff1227976866389edb9c8f7f54b4c82?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "62ba10c0-aaa6-4134-9b49-f01177c898ab"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "6066e4d1-401a-0077-77ff-411f25000000",
-      "x-ms-client-request-id" : "62ba10c0-aaa6-4134-9b49-f01177c898ab",
-      "Date" : "Wed, 05 May 2021 22:38:06 GMT"
+      "x-ms-request-id" : "29f37878-201a-0023-5c06-494001000000",
+      "x-ms-client-request-id" : "49779e27-0367-4073-b9e9-238c21c3bf1d",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "05bff12205bff1227976866389edb9c8f7f54b4c82", "2021-05-05T22:38:05.518038100Z", "2021-05-05T22:38:05.518038100Z" ]
+  "variables" : [ "05bff12205bff122ffa8391528d659a3507b4697b1", "2021-05-14T21:18:18.527645300Z", "2021-05-14T21:18:18.527645300Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParseIA.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParseIA.json
index ba2995c97ee3..4f81f3df55ee 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParseIA.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParseIA.json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=70247e9f&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e07f1187-7ab3-4f69-be8e-e863573ed994"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "03a9d785-001a-0004-71eb-4147b6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>70247e9f</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "e07f1187-7ab3-4f69-be8e-e863573ed994",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "70247e9f70247e9f11a513533249b9b02c714323b0" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "70247e9f70247e9fa05939074304300f68d84b9b9b" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[0].json
index ea52f1da3b3d..23715143b5eb 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[0].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[0].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=8e9e57c6&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c582e244-fd11-4f78-bde3-d8fc3899288c"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "35d398cc-101a-006a-26eb-411299000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>8e9e57c6</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c582e244-fd11-4f78-bde3-d8fc3899288c",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "8e9e57c68e9e57c6ee459844314065db979d43be94" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "8e9e57c68e9e57c6a5383559ed3321c3b6474e14ba" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[1].json
index 68bef6f004eb..d8a047d3f79e 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[1].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[1].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=97856687&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3306a5d6-bc51-45ab-8e75-494961714e2a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "2591417b-201a-0061-08eb-41e9f2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>97856687</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3306a5d6-bc51-45ab-8e75-494961714e2a",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "97856687978566870b1350645033db87db9242dba7" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "9785668797856687b6352095b923415b34504f1f8f" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[2].json
index c6e7bdb162de..1533430a1ae7 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[2].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[2].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=bca83544&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0fd83cf6-3945-4904-8bbb-8976765c9b78"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "67e70431-901a-004b-0beb-4136e2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>bca83544</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "0fd83cf6-3945-4904-8bbb-8976765c9b78",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "bca83544bca83544b1529108cb6b5a95143e430aa0" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "bca83544bca8354402908105b3cf6e7b3d1c438fb8" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[3].json
index da8161cf319d..b227f1747a52 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[3].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[3].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=a5b30405&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4ea7dfaa-3218-4ea0-9797-0369bafc3cf6"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "6442f118-001a-0076-7aeb-4140f9000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>a5b30405</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4ea7dfaa-3218-4ea0-9797-0369bafc3cf6",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "a5b30405a5b3040516a92715200eb08cf0de4df8ba" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "a5b30405a5b30405155151931923ce90d88d439598" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[4].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[4].json
index cc13fe2bff37..d7e9c7754a82 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[4].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[4].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=eaf292c2&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2dc6de0b-3ef9-4e7d-b3b3-7d24b00426cc"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "b685abd8-501a-0036-47eb-4147c1000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>eaf292c2</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2dc6de0b-3ef9-4e7d-b3b3-7d24b00426cc",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "eaf292c2eaf292c23b69287594f64108b8ab4a6a8e" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "eaf292c2eaf292c23b5164066eeaa38cd15f4e5cb0" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[5].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[5].json
index 017924edd0b1..e31553bd8261 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[5].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsParse[5].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=f3e9a383&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "685a9eb0-e669-4981-88f4-a0c8ab422fcf"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "a0212a34-301a-0020-2eeb-41b116000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>f3e9a383</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "685a9eb0-e669-4981-88f4-a0c8ab422fcf",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "f3e9a383f3e9a383589685191f92f80164574de293" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "f3e9a383f3e9a38308141099a276c0b68b7a4f1f8d" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[0].json
index 09560eec6ec6..cd8cb1340da5 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[0].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[0].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=e07a2d14&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "90252101-0ad4-4afb-a622-a15a6df1179a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "b95818ab-c01a-0056-37eb-413b5e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>e07a2d14</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "90252101-0ad4-4afb-a622-a15a6df1179a",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "e07a2d14e07a2d1496900394ecac33c07a6b435e93" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "e07a2d14e07a2d1488746599c30e4b9864b3455094" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[1].json
index ccdeae904b6a..7f20c985c4e1 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[1].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[1].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=f9611c55&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0b75f1ea-b29a-4bd1-9605-5b51229510ff"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "bdb9cfa8-401a-0048-46eb-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>f9611c55</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "0b75f1ea-b29a-4bd1-9605-5b51229510ff",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "f9611c55f9611c5533324128ee72f2947fcc4f329d" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "f9611c55f9611c55b9097914653d2798fa294e1999" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[2].json
index 331e00a655d3..4f55b9df4db5 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[2].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[2].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=d24c4f96&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1d04b1c3-2875-473f-a66a-9d869d247458"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "b95818af-c01a-0056-3aeb-413b5e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>d24c4f96</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "1d04b1c3-2875-473f-a66a-9d869d247458",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "d24c4f96d24c4f967888495239ebd175dfe94405b9" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "d24c4f96d24c4f9680a75660876a4386cb7f4aa4b2" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[3].json
index 2996e833bb62..33ace5f603f8 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[3].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[3].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=cb577ed7&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2382b92f-a063-480e-aa73-75b991d7ae9b"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e8d81be2-701a-0021-3feb-41eeca000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>cb577ed7</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2382b92f-a063-480e-aa73-75b991d7ae9b",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "cb577ed7cb577ed7225406948b6fd569f44540c187" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "cb577ed7cb577ed7ca8732204f8cac2d8ba2407baa" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[4].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[4].json
index f8791d72a92a..34159447fc61 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[4].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsFileSASPermissionsToString[4].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=8416e810&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "63a48f90-5fd0-4962-9d95-fe25a9036764"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "dfc6146d-c01a-0046-3aeb-41fe36000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>8416e810</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "63a48f90-5fd0-4962-9d95-fe25a9036764",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "8416e8108416e81044a150620cbed54e87f2428daf" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "8416e8108416e810f487023321c559c9bb9641feb8" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsParseProtocol.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsParseProtocol.json
index 96ce70d5faf2..5aed3ec2094b 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsParseProtocol.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsParseProtocol.json
@@ -1,136 +1,136 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1b8d9697262b0c8522eb3e4f64a4?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1ba6f37397aa883bb04ff94551b3?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "516e1b7b-460b-412d-b565-46c2ab9611b8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "db0ea04b-52e2-481a-b074-eac85da64d62"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9156E6C476D07",
-      "Last-Modified" : "Wed, 12 May 2021 17:50:25 GMT",
+      "eTag" : "0x8D9171DCB1C641D",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "81146269-101a-0037-4257-47181d000000",
-      "x-ms-client-request-id" : "516e1b7b-460b-412d-b565-46c2ab9611b8",
-      "Date" : "Wed, 12 May 2021 17:50:24 GMT"
+      "x-ms-request-id" : "be261768-801a-002a-0c06-4905d2000000",
+      "x-ms-client-request-id" : "db0ea04b-52e2-481a-b074-eac85da64d62",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1b8d9697262b0c8522eb3e4f64a4/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1ba6f37397aa883bb04ff94551b3/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "745e7d59-9082-42f8-93ea-5de874b43d71"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1d5ea2cb-0d9e-4281-b4d7-eade49c3cf8e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-12T17:50:25.9262124Z",
-      "Last-Modified" : "Wed, 12 May 2021 17:50:25 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.5241357Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 12 May 2021 17:50:25 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-12T17:50:25.9262124Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.5241357Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9156E6C6C5AAC",
-      "x-ms-request-id" : "8114626c-101a-0037-4357-47181d000000",
-      "x-ms-client-request-id" : "745e7d59-9082-42f8-93ea-5de874b43d71",
-      "x-ms-file-last-write-time" : "2021-05-12T17:50:25.9262124Z"
+      "eTag" : "0x8D9171DCB7F430D",
+      "x-ms-request-id" : "8fa71bb4-c01a-002b-0906-495a0e000000",
+      "x-ms-client-request-id" : "1d5ea2cb-0d9e-4281-b4d7-eade49c3cf8e",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.5241357Z"
     },
     "Exception" : null
   }, {
     "Method" : "HEAD",
-    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1b8d9697262b0c8522eb3e4f64a4/filename?sv=2020-08-04&spr=https%2Chttp&se=2021-05-13T17%3A50%3A26Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1ba6f37397aa883bb04ff94551b3/filename?sv=2020-10-02&spr=https%2Chttp&se=2021-05-15T21%3A18%3A18Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b673955c-d2fc-437b-9a36-8f950bc12a04"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "aba2716b-0e2f-4e99-b12b-8c7cb7b14fdd"
     },
     "Response" : {
       "content-length" : "100",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-12T17:50:25.9262124Z",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.5241357Z",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 12 May 2021 17:50:25 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "Date" : "Wed, 12 May 2021 17:50:25 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-server-encrypted" : "true",
       "x-ms-type" : "File",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-12T17:50:25.9262124Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.5241357Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9156E6C6C5AAC",
-      "x-ms-request-id" : "8114626f-101a-0037-4557-47181d000000",
-      "x-ms-client-request-id" : "b673955c-d2fc-437b-9a36-8f950bc12a04",
-      "x-ms-file-last-write-time" : "2021-05-12T17:50:25.9262124Z",
+      "eTag" : "0x8D9171DCB7F430D",
+      "x-ms-request-id" : "8fa71bb6-c01a-002b-0a06-495a0e000000",
+      "x-ms-client-request-id" : "aba2716b-0e2f-4e99-b12b-8c7cb7b14fdd",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.5241357Z",
       "Content-Type" : "application/octet-stream"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1b8d9697262b0c8522eb3e4f64a4?restype=share&sv=2020-08-04&spr=https%2Chttp&se=2021-05-13T17%3A50%3A26Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net/62716b1b62716b1ba6f37397aa883bb04ff94551b3?restype=share&sv=2020-10-02&spr=https%2Chttp&se=2021-05-15T21%3A18%3A18Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8d3040ef-0b64-423f-9b4d-0fda756885c9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7896c9b4-4103-4dda-a5dc-28d57909bf03"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "x-ms-lease-status" : "unlocked",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 12 May 2021 17:50:25 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
-      "x-ms-access-tier-change-time" : "Wed, 12 May 2021 17:50:25 GMT",
+      "x-ms-access-tier-change-time" : "Fri, 14 May 2021 21:18:17 GMT",
       "StatusCode" : "200",
       "x-ms-has-legal-hold" : "false",
-      "Date" : "Wed, 12 May 2021 17:50:25 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "x-ms-share-quota" : "5120",
       "x-ms-access-tier" : "TransactionOptimized",
       "x-ms-has-immutability-policy" : "false",
-      "eTag" : "0x8D9156E6C476D07",
-      "x-ms-request-id" : "81146271-101a-0037-4757-47181d000000",
-      "x-ms-client-request-id" : "8d3040ef-0b64-423f-9b4d-0fda756885c9"
+      "eTag" : "0x8D9171DCB1C641D",
+      "x-ms-request-id" : "8fa71bb7-c01a-002b-0b06-495a0e000000",
+      "x-ms-client-request-id" : "7896c9b4-4103-4dda-a5dc-28d57909bf03"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-08-04&spr=https%2Chttp&se=2021-05-13T17%3A50%3A26Z&sp=r&sig=REDACTED&ss=f&srt=sco",
+    "Uri" : "https://REDACTED.file.core.windows.net?restype=service&comp=properties&sv=2020-10-02&spr=https%2Chttp&se=2021-05-15T21%3A18%3A18Z&sp=r&sig=REDACTED&ss=f&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1bd3c934-8e9c-416b-84c3-97fe322d757c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1b1dc7a5-5554-4424-a42e-4cec9a8fdbb9"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "81146272-101a-0037-4857-47181d000000",
+      "x-ms-request-id" : "db5f14cf-e01a-0013-0206-49fece000000",
       "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /><ProtocolSettings><SMB><Multichannel><Enabled>false</Enabled></Multichannel></SMB></ProtocolSettings></StorageServiceProperties>",
-      "x-ms-client-request-id" : "1bd3c934-8e9c-416b-84c3-97fe322d757c",
-      "Date" : "Wed, 12 May 2021 17:50:25 GMT",
+      "x-ms-client-request-id" : "1b1dc7a5-5554-4424-a42e-4cec9a8fdbb9",
+      "Date" : "Fri, 14 May 2021 21:18:18 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "62716b1b62716b1b8d9697262b0c8522eb3e4f64a4", "2021-05-12T17:50:26.001716800Z" ]
+  "variables" : [ "62716b1b62716b1ba6f37397aa883bb04ff94551b3", "2021-05-14T21:18:18.675641600Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASNetworkIdentifierPermissions.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASNetworkIdentifierPermissions.json
index c25f4a86b1f6..5e88340b5068 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASNetworkIdentifierPermissions.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASNetworkIdentifierPermissions.json
@@ -1,183 +1,143 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a74762ac-1a76-428b-b43d-331993e9e619"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "843f24a9-859b-46f9-9fc3-5b7ec0dc3e61"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C78544",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB1D5018",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:17 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "978062e8-301a-0042-0cff-417331000000",
-      "x-ms-client-request-id" : "a74762ac-1a76-428b-b43d-331993e9e619",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "c79eea31-801a-0067-7b06-49ca3e000000",
+      "x-ms-client-request-id" : "843f24a9-859b-46f9-9fc3-5b7ec0dc3e61",
+      "Date" : "Fri, 14 May 2021 21:18:16 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab?restype=share&comp=acl",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f?restype=share&comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "609c5b87-1064-40f9-bc62-f4ebf678f35f",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9c8faf91-8f99-4dc4-9b3f-454f5ce196d0",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672F5F812",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171DCB669171",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "a8752f3f-b01a-0001-02ff-41956d000000",
-      "x-ms-client-request-id" : "609c5b87-1064-40f9-bc62-f4ebf678f35f",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "be26176b-801a-002a-0d06-4905d2000000",
+      "x-ms-client-request-id" : "9c8faf91-8f99-4dc4-9b3f-454f5ce196d0",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab/80399d5580399d555d8423194bd70b60d3d94870bd?restype=directory&sv=2020-08-04&si=0000&sr=s&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f/80399d5580399d554b485341c461a17e20a74b8a95?restype=directory&sv=2020-10-02&si=0000&sr=s&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fbb558dd-b1d3-4e93-8093-2f02dba67013"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e25e6462-614c-4eef-8d1c-370c1aa7f681"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.4782623Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.4700968Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.4782623Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.4700968Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D910167306BE9F",
-      "x-ms-request-id" : "a8752f40-b01a-0001-03ff-41956d000000",
-      "x-ms-client-request-id" : "fbb558dd-b1d3-4e93-8093-2f02dba67013",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.4782623Z"
+      "eTag" : "0x8D9171DCB770428",
+      "x-ms-request-id" : "29f37876-201a-0023-5b06-494001000000",
+      "x-ms-client-request-id" : "e25e6462-614c-4eef-8d1c-370c1aa7f681",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.4700968Z"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab/80399d5580399d555d8423194bd70b60d3d94870bd?restype=directory&sv=2020-08-04&si=0000&sr=s&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f/80399d5580399d554b485341c461a17e20a74b8a95?restype=directory&sv=2020-10-02&si=0000&sr=s&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "76170198-811d-4d76-a186-7d1a8fa12d79"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e4d37b00-a052-44d1-972c-79ce71d8d5f3"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "dfc51a9f-901a-0074-3fff-41fe41000000",
-      "x-ms-client-request-id" : "76170198-811d-4d76-a186-7d1a8fa12d79",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
+      "x-ms-request-id" : "60b0d412-f01a-0089-4206-496017000000",
+      "x-ms-client-request-id" : "e4d37b00-a052-44d1-972c-79ce71d8d5f3",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab/80399d5580399d555d821463e08f248342ce445abf?restype=directory&sv=2020-08-04&se=2021-05-06T22%3A38%3A05Z&sr=s&sp=rcwdl&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f/80399d5580399d554b4147882cca8fc0fe57403395?restype=directory&sv=2020-10-02&se=2021-05-15T21%3A18%3A18Z&sr=s&sp=rcwdl&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2bbe4d95-3f5f-4be5-9d11-1f02dd3799af"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bb783c2e-63c8-4602-82c1-40f5f5ff99fb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835093239654252544",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.6583908Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:18:18.6712400Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:18:18 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.6583908Z",
+      "x-ms-file-change-time" : "2021-05-14T21:18:18.6712400Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101673223AE4",
-      "x-ms-request-id" : "9b3ae869-601a-005f-7cff-417e8d000000",
-      "x-ms-client-request-id" : "2bbe4d95-3f5f-4be5-9d11-1f02dd3799af",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.6583908Z"
+      "eTag" : "0x8D9171DCB95B550",
+      "x-ms-request-id" : "60b0d414-f01a-0089-4306-496017000000",
+      "x-ms-client-request-id" : "bb783c2e-63c8-4602-82c1-40f5f5ff99fb",
+      "x-ms-file-last-write-time" : "2021-05-14T21:18:18.6712400Z"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab/80399d5580399d555d821463e08f248342ce445abf?restype=directory&sv=2020-08-04&se=2021-05-06T22%3A38%3A05Z&sr=s&sp=rcwdl&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d554b4349600ed6255e16b14ca08f/80399d5580399d554b4147882cca8fc0fe57403395?restype=directory&sv=2020-10-02&se=2021-05-15T21%3A18%3A18Z&sr=s&sp=rcwdl&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "68d8ff70-def7-4fbd-acec-4505fda774d2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c063de30-4e9c-4530-aec9-6ebbaf4f34fa"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "ebffcf70-301a-000f-60ff-41bcdd000000",
-      "x-ms-client-request-id" : "68d8ff70-def7-4fbd-acec-4505fda774d2",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=80399d55&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5e26d93d-6184-490c-84bf-8b1a007bbf34"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "9b3ae86b-601a-005f-7dff-417e8d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>80399d55</Prefix><Shares><Share><Name>80399d5580399d555d8912283dda02a8fb654b41ab</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672F5F812\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "5e26d93d-6184-490c-84bf-8b1a007bbf34",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/80399d5580399d555d8912283dda02a8fb654b41ab?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6d9d697e-9b64-416a-8459-2edb62880495"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "dfc51aa4-901a-0074-43ff-41fe41000000",
-      "x-ms-client-request-id" : "6d9d697e-9b64-416a-8459-2edb62880495",
-      "Date" : "Wed, 05 May 2021 22:38:06 GMT"
+      "x-ms-request-id" : "9d39c9d2-301a-0096-3206-49d313000000",
+      "x-ms-client-request-id" : "c063de30-4e9c-4530-aec9-6ebbaf4f34fa",
+      "Date" : "Fri, 14 May 2021 21:18:17 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "80399d5580399d555d8912283dda02a8fb654b41ab", "2021-05-05T22:38:02.619121700Z", "2021-05-05T22:38:05.568040400Z", "80399d5580399d555d8423194bd70b60d3d94870bd", "80399d5580399d555d821463e08f248342ce445abf" ]
+  "variables" : [ "80399d5580399d554b4349600ed6255e16b14ca08f", "2021-05-14T21:18:14.329060Z", "2021-05-14T21:18:18.496645Z", "80399d5580399d554b485341c461a17e20a74b8a95", "80399d5580399d554b4147882cca8fc0fe57403395" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParseIA.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParseIA.json
index 6b27bff2fa4d..95359d8787d5 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParseIA.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParseIA.json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=4e47c8be&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "02d6a2f7-4380-4901-89d9-4c7a783fd633"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "090f3316-601a-0002-26eb-417409000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>4e47c8be</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "02d6a2f7-4380-4901-89d9-4c7a783fd633",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "4e47c8be4e47c8bedfd961813286ab02297c4b84b1" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "4e47c8be4e47c8bef4c86089927987d4d9634cb7ac" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[0].json
index e317a4b14580..7eb2c9850124 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[0].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[0].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=c2c9242e&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "96fbc69d-0b6a-4940-8c3c-448cf18284ef"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e3899d36-901a-0006-77eb-41f90e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>c2c9242e</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "96fbc69d-0b6a-4940-8c3c-448cf18284ef",
-      "Date" : "Wed, 05 May 2021 20:19:35 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "c2c9242ec2c9242e1bc58860b05e98aabe57461f96" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "c2c9242ec2c9242ef6e72702dc5d53131d534dae81" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[1].json
index cb3d51e46bf3..04ad68d93341 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[1].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[1].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=dbd2156f&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2f773f0c-6f3f-4146-a636-5d96f2fef25c"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "32e937a3-a01a-001d-25eb-41c70d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>dbd2156f</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2f773f0c-6f3f-4146-a636-5d96f2fef25c",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "dbd2156fdbd2156f4d082684067ae139bf3f4eac94" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "dbd2156fdbd2156fd9e343599784c08d08de406fbe" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[2].json
index 030770183f8f..ef768b25358d 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[2].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[2].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=f0ff46ac&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9e24f639-d8e6-4e2c-827f-25b7acb00abd"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "32e937ae-a01a-001d-30eb-41c70d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>f0ff46ac</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9e24f639-d8e6-4e2c-827f-25b7acb00abd",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "f0ff46acf0ff46ac44c7457901178dfe15b14df6bc" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "f0ff46acf0ff46acd552541474e6c8e933ce4d9681" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[3].json
index 94e774ae1023..7fc2e703cd7c 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[3].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[3].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=e9e477ed&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "faaffa5a-6462-4213-ba2b-e6cbbd73e9fb"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "bdb9cfab-401a-0048-49eb-41d786000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>e9e477ed</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "faaffa5a-6462-4213-ba2b-e6cbbd73e9fb",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "e9e477ede9e477ede9d27259f0c2fda3064241e8a6" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "e9e477ede9e477edaa560385ef63c1bf4830412fba" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[4].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[4].json
index 01c47df6a121..244f31a5f28b 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[4].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[4].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=a6a5e12a&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "280adf86-8485-4f6b-9637-2a3ddb3fa904"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "5fe79abd-001a-0066-2ceb-418591000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>a6a5e12a</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "280adf86-8485-4f6b-9637-2a3ddb3fa904",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "a6a5e12aa6a5e12a930528259f03e7bfdbd741da95" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "a6a5e12aa6a5e12aa2274344845239602fa1495898" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[5].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[5].json
index 6bb5fb313135..1a2e11250fc3 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[5].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[5].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=bfbed06b&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cc0a0573-49d3-4102-b9a8-21e782a463b2"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "c7637734-b01a-0011-01eb-415005000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>bfbed06b</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "cc0a0573-49d3-4102-b9a8-21e782a463b2",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "bfbed06bbfbed06b66319642b8fceef7ac5b44ac97" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "bfbed06bbfbed06bf8969395358e1b0935714c5cb9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[6].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[6].json
index 44af5265aa12..4297ce3c32db 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[6].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsParse[6].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=949383a8&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9faab5a8-fec5-476b-b1bb-44651874d31e"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "d97a4ade-801a-0078-2ceb-416949000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>949383a8</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "9faab5a8-fec5-476b-b1bb-44651874d31e",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "949383a8949383a842f070588aed49f3a2184388b4" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "949383a8949383a85f440898b632c46deacf4f6da5" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[0].json
index 0a47ada37e38..45918cc4433f 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[0].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[0].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=b6964222&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "36746f67-2a62-475f-bfd5-a815bad63f2e"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "dae4779e-a01a-0040-65eb-41cd89000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>b6964222</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "36746f67-2a62-475f-bfd5-a815bad63f2e",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "b6964222b6964222a1a075209c95817d0f394802a6" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "b6964222b6964222e8836301d703a14ebe22429792" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[1].json
index 4afebc05a594..a89fc376dc93 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[1].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[1].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=af8d7363&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8000ef39-c859-4aa0-8890-6296dedbe6d2"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "2c916f28-a01a-0032-1ceb-41cac6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>af8d7363</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "8000ef39-c859-4aa0-8890-6296dedbe6d2",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "af8d7363af8d7363b960301446ddec5e84a24d1da4" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "af8d7363af8d73638df742395c467b5fd5c2484898" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[2].json
index 0bd3b13c449b..c26e65a92349 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[2].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[2].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=84a020a0&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4d683e2e-c3d2-444a-8306-106fc3629d81"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "e3899d3d-901a-0006-7beb-41f90e000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>84a020a0</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4d683e2e-c3d2-444a-8306-106fc3629d81",
-      "Date" : "Wed, 05 May 2021 20:19:36 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "84a020a084a020a024d47513061b3830ae9b426bb5" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "84a020a084a020a06ad83075e43aa06d736145d696" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[3].json
index e821ec304303..a1c691a7ae8e 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[3].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[3].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=9dbb11e1&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ca248a26-3b1a-4f17-9b4d-825745169417"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "6daf093c-201a-003c-6ceb-41e376000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>9dbb11e1</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "ca248a26-3b1a-4f17-9b4d-825745169417",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "9dbb11e19dbb11e1fde430860dd1d7ba4637499b83" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "9dbb11e19dbb11e186a944029a375bd76cd24d289c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[4].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[4].json
index d32251dd6cd0..1c54fc44abb6 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[4].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[4].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=d2fa8726&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4866920c-74f3-41a5-b1a1-2cff7c9253f4"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "ebff70c0-301a-000f-70eb-41bcdd000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>d2fa8726</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "4866920c-74f3-41a5-b1a1-2cff7c9253f4",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "d2fa8726d2fa8726abc0862518a0de330b294288aa" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "d2fa8726d2fa87262185981944960ac9d86c4ff484" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[5].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[5].json
index 4b33f95990b8..5465e274ff2d 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[5].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSASTestsShareSASPermissionsToString[5].json
@@ -1,25 +1,4 @@
 {
-  "networkCallRecords" : [ {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=cbe1b667&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5f5b4ac1-ba5f-4aea-af52-e3cb98c711c3"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "9ef28ebc-901a-0064-7ceb-413b29000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>cbe1b667</Prefix><Shares /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "5f5b4ac1-ba5f-4aea-af52-e3cb98c711c3",
-      "Date" : "Wed, 05 May 2021 20:19:37 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "cbe1b667cbe1b667eba735414fb7a3247abe4cdd89" ]
+  "networkCallRecords" : [ ],
+  "variables" : [ "cbe1b667cbe1b667e9a3083275788757226f40c5ad" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsAccountSASNetworkCreateDeleteShare.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsAccountSASNetworkCreateDeleteShare.json
index 55db6911086c..c3677fb2ef21 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsAccountSASNetworkCreateDeleteShare.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsAccountSASNetworkCreateDeleteShare.json
@@ -1,134 +1,94 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/2b74b02e2b74b02ed4a703143af068db030f4b6499?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/2b74b02e2b74b02ed6a70709697470a0c4f9443480?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "494bfcda-bb94-49b5-88fc-70484b784b85"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d05c3823-b783-496b-9b26-fc997358d0fb"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C78CD7",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0BCA8BF2",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ea010bfb-801a-0035-77ff-41a6a5000000",
-      "x-ms-client-request-id" : "494bfcda-bb94-49b5-88fc-70484b784b85",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "c5f3cdf7-301a-0062-5e06-4918e5000000",
+      "x-ms-client-request-id" : "d05c3823-b783-496b-9b26-fc997358d0fb",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/2b74b02e2b74b02ed4a703143af068db030f4b6499/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/2b74b02e2b74b02ed6a70709697470a0c4f9443480/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9839d53e-994c-49d3-9db9-6690cb06bef0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2b2e740b-a711-479f-982a-3d92fecb5e8e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2941310Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:06.6763970Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2941310Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:06.6763970Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EAA5FE",
-      "x-ms-request-id" : "dfc51a9b-901a-0074-3dff-41fe41000000",
-      "x-ms-client-request-id" : "9839d53e-994c-49d3-9db9-6690cb06bef0",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2941310Z"
+      "eTag" : "0x8D9171E0BF5FCC2",
+      "x-ms-request-id" : "c5f3cdfa-301a-0062-5f06-4918e5000000",
+      "x-ms-client-request-id" : "2b2e740b-a711-479f-982a-3d92fecb5e8e",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:06.6763970Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/create?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A05Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/create?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A20%3A06Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d9a72697-91b1-484d-98d8-bd93fc73cb9a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "60d48a19-0c74-4108-b1f0-d2e9b8af2333"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672FB4385",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0C181DFF",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ebffcf69-301a-000f-5aff-41bcdd000000",
-      "x-ms-client-request-id" : "d9a72697-91b1-484d-98d8-bd93fc73cb9a",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "c5f3cdfc-301a-0062-6006-4918e5000000",
+      "x-ms-client-request-id" : "60d48a19-0c74-4108-b1f0-d2e9b8af2333",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/create?restype=share&sv=2020-08-04&ss=f&srt=sco&se=2021-05-06T22%3A38%3A05Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/create?restype=share&sv=2020-10-02&ss=f&srt=sco&se=2021-05-15T21%3A20%3A06Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8e39d72e-de70-49f4-8c68-e470f9dcc82a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a07e605b-ef11-4639-91ce-610eb85b341d"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "6066e4cb-401a-0077-72ff-411f25000000",
-      "x-ms-client-request-id" : "8e39d72e-de70-49f4-8c68-e470f9dcc82a",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=2b74b02e&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "16d34485-7145-450b-a025-8fed92c6039b"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "978062ee-301a-0042-0fff-417331000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>2b74b02e</Prefix><Shares><Share><Name>2b74b02e2b74b02ed4a703143af068db030f4b6499</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C78CD7\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "16d34485-7145-450b-a025-8fed92c6039b",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/2b74b02e2b74b02ed4a703143af068db030f4b6499?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f5868295-083d-40f3-9e31-646ae0e941ed"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "dfc67a6c-c01a-0046-21ff-41fe36000000",
-      "x-ms-client-request-id" : "f5868295-083d-40f3-9e31-646ae0e941ed",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "904c4201-b01a-006c-2d06-493155000000",
+      "x-ms-client-request-id" : "a07e605b-ef11-4639-91ce-610eb85b341d",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "2b74b02e2b74b02ed4a703143af068db030f4b6499", "2021-05-05T22:38:05.513039100Z" ]
+  "variables" : [ "2b74b02e2b74b02ed6a70709697470a0c4f9443480", "2021-05-14T21:20:06.922890700Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestDownloadUpload.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestDownloadUpload.json
index cc1141e7680b..7f3748201ad0 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestDownloadUpload.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestDownloadUpload.json
@@ -1,181 +1,141 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe95238268fc8f834bf6354c78b7?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d2f616ea-63e8-4773-8e47-9da91fdcf82c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "29a1655f-b9a5-4f2b-9415-104a700b69f8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C75B86",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0BC64E79",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ad0f9a41-401a-0067-67ff-41da4d000000",
-      "x-ms-client-request-id" : "d2f616ea-63e8-4773-8e47-9da91fdcf82c",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "904c41f3-b01a-006c-2206-493155000000",
+      "x-ms-client-request-id" : "29a1655f-b9a5-4f2b-9415-104a700b69f8",
+      "Date" : "Fri, 14 May 2021 21:20:05 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe95238268fc8f834bf6354c78b7/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8e2b3306-8aa2-42db-942e-cbfc26504830"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "527601e0-d85c-4030-b927-27360996c420"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2961324Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:06.6733947Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:05 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2961324Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:06.6733947Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EAF42C",
-      "x-ms-request-id" : "ea010bfe-801a-0035-78ff-41a6a5000000",
-      "x-ms-client-request-id" : "8e2b3306-8aa2-42db-942e-cbfc26504830",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2961324Z"
+      "eTag" : "0x8D9171E0BF5877B",
+      "x-ms-request-id" : "904c41fc-b01a-006c-2906-493155000000",
+      "x-ms-client-request-id" : "527601e0-d85c-4030-b927-27360996c420",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:06.6733947Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab/filename?comp=range",
+    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe95238268fc8f834bf6354c78b7/filename?comp=range",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2ca8b564-6291-4b45-b0af-08939a6bd127",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b5282cea-a5c4-4f10-8f07-07949e174e93",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672FF6A41",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0C1990D9",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ea010c00-801a-0035-79ff-41a6a5000000",
+      "x-ms-request-id" : "904c41ff-b01a-006c-2b06-493155000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "2ca8b564-6291-4b45-b0af-08939a6bd127",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-client-request-id" : "b5282cea-a5c4-4f10-8f07-07949e174e93",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g=="
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab/filename?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe95238268fc8f834bf6354c78b7/filename?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A20%3A07Z&se=2021-05-15T21%3A20%3A07Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8d074c8f-e4d8-42ff-a7ad-bf4aa1294d2d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3ba65548-8980-4ee3-8886-fcabec31c403"
     },
     "Response" : {
       "content-length" : "1024",
       "x-ms-lease-status" : "unlocked",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2961324Z",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:06.6733947Z",
       "x-ms-lease-state" : "available",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
       "x-ms-file-attributes" : "Archive",
-      "eTag" : "0x8D9101672FF6A41",
+      "eTag" : "0x8D9171E0C1990D9",
       "Content-Length" : "1024",
-      "x-ms-request-id" : "802251ce-701a-006c-27ff-412126000000",
+      "x-ms-request-id" : "c5f3ce00-301a-0062-6306-4918e5000000",
       "Body" : "test\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
       "Content-Type" : "type",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "Accept-Ranges" : "bytes",
       "x-ms-server-encrypted" : "true",
       "x-ms-type" : "File",
       "Cache-Control" : "cache",
       "Content-Disposition" : "disposition",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2961324Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:06.6733947Z",
       "x-ms-file-parent-id" : "0",
       "Content-Language" : "language",
-      "x-ms-client-request-id" : "8d074c8f-e4d8-42ff-a7ad-bf4aa1294d2d",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2961324Z"
+      "x-ms-client-request-id" : "3ba65548-8980-4ee3-8886-fcabec31c403",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:06.6733947Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab/filename?comp=range&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe95238268fc8f834bf6354c78b7/filename?comp=range&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A20%3A07Z&se=2021-05-15T21%3A20%3A07Z&sr=f&sp=rcwd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8bd8e067-81ad-4e3e-891e-95cfadb33db9",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "36e6130e-e594-4979-96b2-b4d90e41034c",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910167319388A",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0C3E84B6",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:07 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "ad0f9a4b-401a-0067-6bff-41da4d000000",
+      "x-ms-request-id" : "5bbb024c-f01a-0042-0406-496342000000",
       "x-ms-request-server-encrypted" : "true",
-      "x-ms-client-request-id" : "8bd8e067-81ad-4e3e-891e-95cfadb33db9",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "x-ms-client-request-id" : "36e6130e-e594-4979-96b2-b4d90e41034c",
+      "Date" : "Fri, 14 May 2021 21:20:07 GMT",
       "Content-MD5" : "CY9rzUYh03PK3k6DJie09g=="
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=cc2a41fe&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2126ba91-cc7b-40fe-be33-8384faf3308d"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "dfc51aa3-901a-0074-42ff-41fe41000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>cc2a41fe</Prefix><Shares><Share><Name>cc2a41fecc2a41fe69247112d10f67b6097b4566ab</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C75B86\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "2126ba91-cc7b-40fe-be33-8384faf3308d",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/cc2a41fecc2a41fe69247112d10f67b6097b4566ab?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "215d0818-fbba-4812-956d-5c8d122f1adf"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "ea010c06-801a-0035-7dff-41a6a5000000",
-      "x-ms-client-request-id" : "215d0818-fbba-4812-956d-5c8d122f1adf",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "cc2a41fecc2a41fe69247112d10f67b6097b4566ab", "2021-05-05T22:38:05.617039300Z", "2021-05-05T22:38:05.617039300Z" ]
+  "variables" : [ "cc2a41fecc2a41fe95238268fc8f834bf6354c78b7", "2021-05-14T21:20:07.051881800Z", "2021-05-14T21:20:07.060886Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestUploadFails.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestUploadFails.json
index 54aaba11eb1a..9341b61c6483 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestUploadFails.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsFileSASNetworkTestUploadFails.json
@@ -1,136 +1,96 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177553700892f57f37c5adb400cb9?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177d5d67884e845f6d95048419c83?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "52606926-8d7b-4cb3-84f4-152fbea06c30"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "34de6398-9d48-4045-a416-3f6af6e8d6f0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C6E42D",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0BF1DFE3",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "802251c6-701a-006c-22ff-412126000000",
-      "x-ms-client-request-id" : "52606926-8d7b-4cb3-84f4-152fbea06c30",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "5bbb0247-f01a-0042-0106-496342000000",
+      "x-ms-client-request-id" : "34de6398-9d48-4045-a416-3f6af6e8d6f0",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177553700892f57f37c5adb400cb9/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177d5d67884e845f6d95048419c83/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d43f684d-25d3-4691-a3bc-321c812f3c6a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3062d0b0-6a69-4aca-9f74-de6dba1d3463"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2961324Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:06.9155680Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2961324Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:06.9155680Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EAF42C",
-      "x-ms-request-id" : "ad0f9a46-401a-0067-68ff-41da4d000000",
-      "x-ms-client-request-id" : "d43f684d-25d3-4691-a3bc-321c812f3c6a",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2961324Z"
+      "eTag" : "0x8D9171E0C1A7B60",
+      "x-ms-request-id" : "5bbb024a-f01a-0042-0206-496342000000",
+      "x-ms-client-request-id" : "3062d0b0-6a69-4aca-9f74-de6dba1d3463",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:06.9155680Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177553700892f57f37c5adb400cb9/filename?comp=range&sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177d5d67884e845f6d95048419c83/filename?comp=range&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A20%3A07Z&se=2021-05-15T21%3A20%3A07Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "40210bab-bcf5-4567-8e5c-722845b49d43",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c2defa6a-8b6d-45b3-bdff-a3e142831b87",
       "Content-Type" : "application/octet-stream"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "9b3ae864-601a-005f-78ff-417e8d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:9b3ae864-601a-005f-78ff-417e8d000000\nTime:2021-05-05T22:38:05.4314873Z</Message></Error>",
-      "x-ms-client-request-id" : "40210bab-bcf5-4567-8e5c-722845b49d43",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "x-ms-request-id" : "5bbb024b-f01a-0042-0306-496342000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:5bbb024b-f01a-0042-0306-496342000000\nTime:2021-05-14T21:20:07.0687447Z</Message></Error>",
+      "x-ms-client-request-id" : "c2defa6a-8b6d-45b3-bdff-a3e142831b87",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177553700892f57f37c5adb400cb9/filename?sv=2020-08-04&spr=https%2Chttp&st=2021-05-04T22%3A38%3A05Z&se=2021-05-06T22%3A38%3A05Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
+    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177d5d67884e845f6d95048419c83/filename?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A20%3A07Z&se=2021-05-15T21%3A20%3A07Z&sr=f&sp=rcd&sig=REDACTED&rscc=cache&rscd=disposition&rsce=encoding&rscl=language&rsct=type",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "87387254-ccb6-41a5-af83-68685f7fe12c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d137b9b2-4ad5-4c7f-9b37-fe1610154ca8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "dfc67a6a-c01a-0046-20ff-41fe36000000",
-      "x-ms-client-request-id" : "87387254-ccb6-41a5-af83-68685f7fe12c",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=807e6177&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3201c09d-a435-464f-a96e-c97335f7135a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "802251d0-701a-006c-28ff-412126000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>807e6177</Prefix><Shares><Share><Name>807e6177807e6177553700892f57f37c5adb400cb9</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672C6E42D\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3201c09d-a435-464f-a96e-c97335f7135a",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/807e6177807e6177553700892f57f37c5adb400cb9?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "33c7edb6-f85b-4c73-9358-0a6db9ebd308"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "ad0f9a4f-401a-0067-6fff-41da4d000000",
-      "x-ms-client-request-id" : "33c7edb6-f85b-4c73-9358-0a6db9ebd308",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
+      "x-ms-request-id" : "c5f3ce05-301a-0062-6606-4918e5000000",
+      "x-ms-client-request-id" : "d137b9b2-4ad5-4c7f-9b37-fe1610154ca8",
+      "Date" : "Fri, 14 May 2021 21:20:07 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "807e6177807e6177553700892f57f37c5adb400cb9", "2021-05-05T22:38:05.515039900Z", "2021-05-05T22:38:05.531038800Z" ]
+  "variables" : [ "807e6177807e6177d5d67884e845f6d95048419c83", "2021-05-14T21:20:07.061881900Z", "2021-05-14T21:20:07.061881900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsShareSASNetworkIdentifierPermissions.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsShareSASNetworkIdentifierPermissions.json
index bf336e0fa77a..0befe3807773 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsShareSASNetworkIdentifierPermissions.json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileSasClientTestsShareSASNetworkIdentifierPermissions.json
@@ -1,212 +1,172 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1cf5cb3c-ce99-40ad-b104-32dc9fe66e1a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b4d2f62f-c917-4adc-a998-fde81bfc6cd5"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672C7229E",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0BE0F7D1",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6066e4c6-401a-0077-6fff-411f25000000",
-      "x-ms-client-request-id" : "1cf5cb3c-ce99-40ad-b104-32dc9fe66e1a",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT"
+      "x-ms-request-id" : "e0a159df-601a-008b-4106-49deaf000000",
+      "x-ms-client-request-id" : "b4d2f62f-c917-4adc-a998-fde81bfc6cd5",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5/filename",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85/filename",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "09546236-c56e-45f4-965b-28eb5fc8a434"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9e573de8-268a-48ef-a8af-ade61c35eb56"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "4010187179898695473*11459378189709739967",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:05.2971334Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:06.6743956Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:06 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:04 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T22:38:05.2971334Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:06.6743956Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101672EB1B46",
-      "x-ms-request-id" : "dfc67a66-c01a-0046-1eff-41fe36000000",
-      "x-ms-client-request-id" : "09546236-c56e-45f4-965b-28eb5fc8a434",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:05.2971334Z"
+      "eTag" : "0x8D9171E0BF5AE94",
+      "x-ms-request-id" : "e0a159e2-601a-008b-4206-49deaf000000",
+      "x-ms-client-request-id" : "9e573de8-268a-48ef-a8af-ade61c35eb56",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:06.6743956Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5?restype=share&comp=acl",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85?restype=share&comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "03234311-620e-4456-9261-95da85721ba8",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a22ae721-02d2-410d-b6fa-bfde10498ddd",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D9101672FB0216",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:05 GMT",
+      "eTag" : "0x8D9171E0C27CD6B",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:07 GMT",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "6066e4ca-401a-0077-71ff-411f25000000",
-      "x-ms-client-request-id" : "03234311-620e-4456-9261-95da85721ba8",
-      "Date" : "Wed, 05 May 2021 22:38:05 GMT"
+      "x-ms-request-id" : "e0a159e3-601a-008b-4306-49deaf000000",
+      "x-ms-client-request-id" : "a22ae721-02d2-410d-b6fa-bfde10498ddd",
+      "Date" : "Fri, 14 May 2021 21:20:06 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5/dir?restype=directory&sv=2020-08-04&si=0000&sr=s&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85/dir?restype=directory&sv=2020-10-02&si=0000&sr=s&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3165c5e0-6394-4b0b-a412-442e5cb1dff7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b71bbfac-8b9c-4b62-bdac-e046e788ee07"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
       "x-ms-file-id" : "13835093239654252544",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:35.5137179Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:35 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:37.1511677Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:37 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:35 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:36 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:35.5137179Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:37.1511677Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D9101684EDCA9B",
-      "x-ms-request-id" : "97806322-301a-0042-23ff-417331000000",
-      "x-ms-client-request-id" : "3165c5e0-6394-4b0b-a412-442e5cb1dff7",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:35.5137179Z"
+      "eTag" : "0x8D9171E1E20117D",
+      "x-ms-request-id" : "c5f3ce73-301a-0062-2a06-4918e5000000",
+      "x-ms-client-request-id" : "b71bbfac-8b9c-4b62-bdac-e046e788ee07",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:37.1511677Z"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5/dir?restype=directory&sv=2020-08-04&si=0000&sr=s&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85/dir?restype=directory&sv=2020-10-02&si=0000&sr=s&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3bd7cabb-675a-4904-bd53-a4f863874048"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b8728709-30b2-4f3f-9d79-a97bd2c45161"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "a8752f92-b01a-0001-18ff-41956d000000",
-      "x-ms-client-request-id" : "3bd7cabb-675a-4904-bd53-a4f863874048",
-      "Date" : "Wed, 05 May 2021 22:38:34 GMT"
+      "x-ms-request-id" : "c5f3ce77-301a-0062-2b06-4918e5000000",
+      "x-ms-client-request-id" : "b8728709-30b2-4f3f-9d79-a97bd2c45161",
+      "Date" : "Fri, 14 May 2021 21:20:37 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5/dir?restype=directory&sv=2020-08-04&se=2021-05-06T22%3A38%3A35Z&sr=s&sp=rcwdl&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85/dir?restype=directory&sv=2020-10-02&se=2021-05-15T21%3A20%3A37Z&sr=s&sp=rcwdl&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c60c8212-5ad7-4f48-b41f-032b1d98314a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4c900231-1060-4862-9e4f-9738d8c08519"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
-      "x-ms-file-id" : "13835163608398430208",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "17860367565182308406*11459378189709739967",
+      "x-ms-file-id" : "11529250230440558592",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T22:38:35.6828386Z",
-      "Last-Modified" : "Wed, 05 May 2021 22:38:35 GMT",
+      "x-ms-file-creation-time" : "2021-05-14T21:20:37.4133540Z",
+      "Last-Modified" : "Fri, 14 May 2021 21:20:37 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 22:38:35 GMT",
+      "Date" : "Fri, 14 May 2021 21:20:37 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T22:38:35.6828386Z",
+      "x-ms-file-change-time" : "2021-05-14T21:20:37.4133540Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D91016850798E2",
-      "x-ms-request-id" : "ad0f9a9e-401a-0067-80ff-41da4d000000",
-      "x-ms-client-request-id" : "c60c8212-5ad7-4f48-b41f-032b1d98314a",
-      "x-ms-file-last-write-time" : "2021-05-05T22:38:35.6828386Z"
+      "eTag" : "0x8D9171E1E481324",
+      "x-ms-request-id" : "c5f3ce78-301a-0062-2c06-4918e5000000",
+      "x-ms-client-request-id" : "4c900231-1060-4862-9e4f-9738d8c08519",
+      "x-ms-file-last-write-time" : "2021-05-14T21:20:37.4133540Z"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5/dir?restype=directory&sv=2020-08-04&se=2021-05-06T22%3A38%3A35Z&sr=s&sp=rcwdl&sig=REDACTED",
+    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64fa812765b7c9466e41434f0e85/dir?restype=directory&sv=2020-10-02&se=2021-05-15T21%3A20%3A37Z&sr=s&sp=rcwdl&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "28725ed6-db58-47b4-9e2c-77c3453bbe86"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6c56c7bc-8bb7-46c2-b92d-56f9b6c09c61"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "ebffcfa4-301a-000f-72ff-41bcdd000000",
-      "x-ms-client-request-id" : "28725ed6-db58-47b4-9e2c-77c3453bbe86",
-      "Date" : "Wed, 05 May 2021 22:38:35 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=e240ca64&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "96280d89-7cd3-4014-a57c-90726c93032b"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "dfc67ac1-c01a-0046-36ff-41fe36000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>e240ca64</Prefix><Shares><Share><Name>e240ca64e240ca64a4444294e7451a71b287451cb5</Name><Properties><Last-Modified>Wed, 05 May 2021 22:38:05 GMT</Last-Modified><Etag>\"0x8D9101672FB0216\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 22:38:05 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "96280d89-7cd3-4014-a57c-90726c93032b",
-      "Date" : "Wed, 05 May 2021 22:38:35 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/e240ca64e240ca64a4444294e7451a71b287451cb5?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "80fb8581-6f78-4d12-8408-8aeaba4a8690"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "ea010c57-801a-0035-0eff-41a6a5000000",
-      "x-ms-client-request-id" : "80fb8581-6f78-4d12-8408-8aeaba4a8690",
-      "Date" : "Wed, 05 May 2021 22:38:35 GMT"
+      "x-ms-request-id" : "c5f3ce79-301a-0062-2d06-4918e5000000",
+      "x-ms-client-request-id" : "6c56c7bc-8bb7-46c2-b92d-56f9b6c09c61",
+      "Date" : "Fri, 14 May 2021 21:20:37 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "e240ca64e240ca64a4444294e7451a71b287451cb5", "2021-05-05T22:38:05.492039700Z", "2021-05-05T22:38:35.611327200Z" ]
+  "variables" : [ "e240ca64e240ca64fa812765b7c9466e41434f0e85", "2021-05-14T21:20:06.894893400Z", "2021-05-14T21:20:37.154345300Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/CHANGELOG.md b/sdk/storage/azure-storage-queue/CHANGELOG.md
index b25ab03aad10..fbfb3f899bf0 100644
--- a/sdk/storage/azure-storage-queue/CHANGELOG.md
+++ b/sdk/storage/azure-storage-queue/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.10.0-beta.2 (Unreleased)
-
+- Added support for the 2020-10-02 service version.
 
 ## 12.10.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
index c34a25f9a0c4..6f6cb7aa4aa0 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
@@ -15,7 +15,8 @@ public enum QueueServiceVersion implements ServiceVersion {
     V2020_02_10("2020-02-10"),
     V2020_04_08("2020-04-08"),
     V2020_06_12("2020-06-12"),
-    V2020_08_04("2020-08-04");
+    V2020_08_04("2020-08-04"),
+    V2020_10_02("2020-10-02");
 
     private final String version;
 
@@ -37,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link QueueServiceVersion}
      */
     public static QueueServiceVersion getLatest() {
-        return V2020_08_04;
+        return V2020_10_02;
     }
 }
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
index 9e8d76822eb4..dc212538918e 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
@@ -1,42 +1,42 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd1565929340212e359164473cbb?sv=2019-02-02&ss=q&srt=sco&se=2021-05-05T17%3A18%3A32Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd14d6753666b2a152298240a8ab?sv=2019-02-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "294652a0-533a-4b4c-a0a2-80f69e7b4218"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1e375e25-dc1b-4398-ac92-887db6460c24"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b050af46-6003-00cb-3909-41f574000000",
-      "x-ms-client-request-id" : "294652a0-533a-4b4c-a0a2-80f69e7b4218",
-      "Date" : "Tue, 04 May 2021 17:18:35 GMT"
+      "x-ms-request-id" : "7688de67-1003-0007-7c0c-49b6a1000000",
+      "x-ms-client-request-id" : "1e375e25-dc1b-4398-ac92-887db6460c24",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd1565929340212e359164473cbb?sv=2019-02-02&ss=q&srt=sco&se=2021-05-05T17%3A18%3A32Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd14d6753666b2a152298240a8ab?sv=2019-02-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7b7435fd-0a5f-4e0d-9a3f-838578d686aa"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d5fde9d0-96ce-4c42-8384-15be30f8caf6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "34fa79ff-1003-0078-4209-4155d9000000",
-      "x-ms-client-request-id" : "7b7435fd-0a5f-4e0d-9a3f-838578d686aa",
-      "Date" : "Tue, 04 May 2021 17:18:37 GMT"
+      "x-ms-request-id" : "1f9871e3-3003-0096-690c-49d313000000",
+      "x-ms-client-request-id" : "d5fde9d0-96ce-4c42-8384-15be30f8caf6",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "cf320dddcf320ddd15643464768a435b47ca498883", "2021-05-04T17:18:32.540972200Z", "cf320dddcf320ddd1565929340212e359164473cbb" ]
+  "variables" : [ "cf320dddcf320ddd14d430511f7fcd7ca2944e3095", "2021-05-14T21:57:33.025832900Z", "cf320dddcf320ddd14d6753666b2a152298240a8ab" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASListQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASListQueues.json
index c098e0900375..05ef40df6c38 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASListQueues.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASListQueues.json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "f3c5a2f7f3c5a2f7a4019563817a729d77a34604bc", "2021-05-04T17:18:32.453969600Z" ]
+  "variables" : [ "f3c5a2f7f3c5a2f748f66131ee705a97c4b744439f", "2021-05-14T21:57:33.025832900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASNetworkOnEndpoint.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASNetworkOnEndpoint.json
index 1164d70931ce..6cef04a2f44e 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASNetworkOnEndpoint.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASNetworkOnEndpoint.json
@@ -1,42 +1,42 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/150557ed150557ed12323776ca37bfa409524a4d87?sv=2020-08-04&se=2021-05-05T20%3A02%3A10Z&sp=rwdlc&sig=REDACTED&ss=q&srt=sco",
+    "Uri" : "https://REDACTED.queue.core.windows.net/150557ed150557edf035256614ae00ec96a54eae8a?sv=2020-10-02&se=2021-05-15T21%3A57%3A33Z&sp=rwdlc&sig=REDACTED&ss=q&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8930552b-1cc3-4968-b7be-b2e19c0fc125"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e3d1cf66-7ff3-4377-87a2-591464523d73"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6e3f043b-d003-00bc-6320-4120e0000000",
-      "x-ms-client-request-id" : "8930552b-1cc3-4968-b7be-b2e19c0fc125",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "6362bba6-1003-0065-370c-497486000000",
+      "x-ms-client-request-id" : "e3d1cf66-7ff3-4377-87a2-591464523d73",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/150557ed150557ed12323776ca37bfa409524a4d87?sv=2020-08-04&se=2021-05-05T20%3A02%3A10Z&sp=rwdlc&sig=REDACTED&ss=q&srt=sco",
+    "Uri" : "https://REDACTED.queue.core.windows.net/150557ed150557edf035256614ae00ec96a54eae8a?sv=2020-10-02&se=2021-05-15T21%3A57%3A33Z&sp=rwdlc&sig=REDACTED&ss=q&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e30969a8-46df-49df-b625-c607347e0c6d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "53906865-deb4-4ac7-a02f-1619eb8865e8"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "1d52a4cb-1003-009c-5220-415b47000000",
-      "x-ms-client-request-id" : "e30969a8-46df-49df-b625-c607347e0c6d",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "353bf73e-0003-008d-470c-49ed10000000",
+      "x-ms-client-request-id" : "53906865-deb4-4ac7-a02f-1619eb8865e8",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "150557ed150557ed123766407ad671d3728f403a9c", "2021-05-04T20:02:10.393092500Z", "150557ed150557ed12323776ca37bfa409524a4d87" ]
+  "variables" : [ "150557ed150557edf03469697133ac2550694d19b8", "2021-05-14T21:57:33.025832900Z", "150557ed150557edf035256614ae00ec96a54eae8a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsCanUseSasToAuthenticate.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsCanUseSasToAuthenticate.json
index e4cbeeb88f9f..7861c43ef27b 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsCanUseSasToAuthenticate.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsCanUseSasToAuthenticate.json
@@ -1,152 +1,152 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5292d78292153f0fb1f4b82451d8d",
+    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5294377070029f4d7cfc1e440e7a6",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "05d14bc5-a0e9-4ea4-96b9-c95b49bee2e5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7f305471-68e2-4262-844a-1c89cf80ecc7"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "1d52a4b7-1003-009c-4a20-415b47000000",
-      "x-ms-client-request-id" : "05d14bc5-a0e9-4ea4-96b9-c95b49bee2e5",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "727fd779-d003-0037-0d0c-49086e000000",
+      "x-ms-client-request-id" : "7f305471-68e2-4262-844a-1c89cf80ecc7",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5292d78292153f0fb1f4b82451d8d?comp=metadata&sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5294377070029f4d7cfc1e440e7a6?comp=metadata&sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a5402a8a-4ff7-4d28-8305-2f8b1f85f324"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5ac928d8-5004-4600-aa33-ed761d7132c0"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "x-ms-approximate-messages-count" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8d2d9a95-4003-0091-0c20-419393000000",
-      "x-ms-client-request-id" : "a5402a8a-4ff7-4d28-8305-2f8b1f85f324",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "c2372edb-2003-008a-740c-498173000000",
+      "x-ms-client-request-id" : "5ac928d8-5004-4600-aa33-ed761d7132c0",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5292d78292153f0fb1f4b82451d8d?comp=metadata&sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5294377070029f4d7cfc1e440e7a6?comp=metadata&sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e7fc048c-e033-4466-a24e-0989c29dd1bd"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cc657f57-c295-447c-88d9-176fa428411e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "x-ms-approximate-messages-count" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8d2d9a9a-4003-0091-1020-419393000000",
-      "x-ms-client-request-id" : "e7fc048c-e033-4466-a24e-0989c29dd1bd",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "c2372efa-2003-008a-0e0c-498173000000",
+      "x-ms-client-request-id" : "cc657f57-c295-447c-88d9-176fa428411e",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5292d78292153f0fb1f4b82451d8d?comp=metadata&sv=2020-08-04&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED&ss=q&srt=sco",
+    "Uri" : "https://REDACTED.queue.core.windows.net/829ac529829ac5294377070029f4d7cfc1e440e7a6?comp=metadata&sv=2020-10-02&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED&ss=q&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "49d87a2a-d54e-4a03-a909-58408ccde16d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "972c8147-6c5d-4160-953e-02f6b5fe6107"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "x-ms-approximate-messages-count" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1d52a4d8-1003-009c-5920-415b47000000",
-      "x-ms-client-request-id" : "49d87a2a-d54e-4a03-a909-58408ccde16d",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "07c75fa7-9003-0054-480c-499595000000",
+      "x-ms-client-request-id" : "972c8147-6c5d-4160-953e-02f6b5fe6107",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8619b909-db1c-48cd-932b-b9c9d900d2bd"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "aa0d79b6-af00-4fc5-9a8d-b19c608a1cfa"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1d52a4da-1003-009c-5b20-415b47000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "x-ms-client-request-id" : "8619b909-db1c-48cd-932b-b9c9d900d2bd",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "07c75fb3-9003-0054-510c-499595000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "x-ms-client-request-id" : "aa0d79b6-af00-4fc5-9a8d-b19c608a1cfa",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4764bbbb-8597-4b50-bfde-b2ec4b04e2e8"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6fd26bab-a1be-4131-bfd7-1a8060f9648e"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8d2d9abe-4003-0091-2e20-419393000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "x-ms-client-request-id" : "4764bbbb-8597-4b50-bfde-b2ec4b04e2e8",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "07c75fd2-9003-0054-6c0c-499595000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "x-ms-client-request-id" : "6fd26bab-a1be-4131-bfd7-1a8060f9648e",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-08-04&se=2021-05-05T20%3A02%3A10Z&sp=r&sig=REDACTED&ss=q&srt=sco",
+    "Uri" : "https://REDACTED.queue.core.windows.net?restype=service&comp=properties&sv=2020-10-02&se=2021-05-15T21%3A57%3A33Z&sp=r&sig=REDACTED&ss=q&srt=sco",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cd5bcf66-363a-4f99-8aa9-cbce6d7966da"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ccdcbb73-7025-4d88-91e1-584def8355a4"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "53b7bc2a-5003-00a2-4920-41cc38000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>true</Write><Delete>true</Delete><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>false</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>3</Days></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
-      "x-ms-client-request-id" : "cd5bcf66-363a-4f99-8aa9-cbce6d7966da",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "1aa63bfa-1003-0081-530c-497a18000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors /></StorageServiceProperties>",
+      "x-ms-client-request-id" : "ccdcbb73-7025-4d88-91e1-584def8355a4",
+      "Date" : "Fri, 14 May 2021 21:57:37 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "829ac529829ac5292d78292153f0fb1f4b82451d8d", "2021-05-04T20:02:10.393092500Z" ]
+  "variables" : [ "829ac529829ac5294377070029f4d7cfc1e440e7a6", "2021-05-14T21:57:33.025832900Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithIdentifier.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithIdentifier.json
index 77234f3a4849..b28ee1b8d024 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithIdentifier.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithIdentifier.json
@@ -1,109 +1,109 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f98b64932bd2b594480424748be",
+    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f163549254a290b491423480cb3",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "70847fce-9299-47e1-9583-f9a306040398"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b503fdb3-e8b0-411e-98b6-f52bf3d922c2"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b4b06ff7-f003-00ab-0920-4189eb000000",
-      "x-ms-client-request-id" : "70847fce-9299-47e1-9583-f9a306040398",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "20c32b3a-9003-0009-0f0c-499f11000000",
+      "x-ms-client-request-id" : "b503fdb3-e8b0-411e-98b6-f52bf3d922c2",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f98b64932bd2b594480424748be/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f163549254a290b491423480cb3/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3232cb6b-26e7-4b03-93d7-db38d964780c",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "51a1c429-955c-41c4-a964-ab8879539503",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b49c95d5-b003-003c-3d20-41dfe6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e7ef4499-1639-4918-8075-44e70ec7af95</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALiC9XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "3232cb6b-26e7-4b03-93d7-db38d964780c",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "07c75f53-9003-0054-7e0c-499595000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62097785-2f47-4e24-b5e9-6cb475b6239f</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAKhZ5JgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "51a1c429-955c-41c4-a964-ab8879539503",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f98b64932bd2b594480424748be?comp=acl",
+    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f163549254a290b491423480cb3?comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "666eaddc-13b9-4082-82f2-16ff2dc69ecd",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "82a1f2db-92f6-4113-9372-59855ba97ce0",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "785dfb6e-3003-000d-0120-413ef5000000",
-      "x-ms-client-request-id" : "666eaddc-13b9-4082-82f2-16ff2dc69ecd",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "c2372f19-2003-008a-270c-498173000000",
+      "x-ms-client-request-id" : "82a1f2db-92f6-4113-9372-59855ba97ce0",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f98b64932bd2b594480424748be/messages?sv=2020-08-04&si=622deae1-fd41-4218-bba0-29a59e090bb7&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f163549254a290b491423480cb3/messages?sv=2020-10-02&si=415b8d8e-a893-4dc1-abba-d7b3d6b7761d&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "25e1b048-af09-4e86-9e4b-deb3512ad826",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b767d24e-068d-4347-9d24-198f0298ed3e",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b4b073b7-f003-00ab-6320-4189eb000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3a9b8c1e-9647-43c0-9c45-471899e21123</MessageId><InsertionTime>Tue, 04 May 2021 20:02:43 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbj/RcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "25e1b048-af09-4e86-9e4b-deb3512ad826",
-      "Date" : "Tue, 04 May 2021 20:02:43 GMT",
+      "x-ms-request-id" : "1aa648dd-1003-0081-290c-497a18000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>da0e9f2f-c127-4cd1-9019-5f7752145f51</MessageId><InsertionTime>Fri, 14 May 2021 21:58:06 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:58:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAsO+WOAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:06 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "b767d24e-068d-4347-9d24-198f0298ed3e",
+      "Date" : "Fri, 14 May 2021 21:58:06 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f98b64932bd2b594480424748be/messages?numofmessages=2&visibilitytimeout=30&sv=2020-08-04&si=622deae1-fd41-4218-bba0-29a59e090bb7&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/9902f01f9902f01f163549254a290b491423480cb3/messages?numofmessages=2&visibilitytimeout=30&sv=2020-10-02&si=415b8d8e-a893-4dc1-abba-d7b3d6b7761d&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ff130a3c-ab8a-436e-9d45-8b8317a12299"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a0d2ca6f-b307-4b55-92ed-79134f96910b"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "785e0190-3003-000d-6620-413ef5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e7ef4499-1639-4918-8075-44e70ec7af95</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJmDBgyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:03:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>3a9b8c1e-9647-43c0-9c45-471899e21123</MessageId><InsertionTime>Tue, 04 May 2021 20:02:43 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAJmDBgyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:03:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "ff130a3c-ab8a-436e-9d45-8b8317a12299",
-      "Date" : "Tue, 04 May 2021 20:02:42 GMT",
+      "x-ms-request-id" : "1aa648e7-1003-0081-2e0c-497a18000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>62097785-2f47-4e24-b5e9-6cb475b6239f</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAkX+CSgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>da0e9f2f-c127-4cd1-9019-5f7752145f51</MessageId><InsertionTime>Fri, 14 May 2021 21:58:06 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:58:06 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAkX+CSgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:36 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "a0d2ca6f-b307-4b55-92ed-79134f96910b",
+      "Date" : "Fri, 14 May 2021 21:58:06 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "9902f01f9902f01f98b64932bd2b594480424748be", "2021-05-04T20:02:13.386793400Z", "2021-05-04T20:02:13.391792600Z", "622deae1-fd41-4218-bba0-29a59e090bb7", "9902f01f9902f01f98b13679b504dde43d4b49f280" ]
+  "variables" : [ "9902f01f9902f01f163549254a290b491423480cb3", "2021-05-14T21:57:36.633826900Z", "2021-05-14T21:57:36.642821900Z", "415b8d8e-a893-4dc1-abba-d7b3d6b7761d", "9902f01f9902f01f16362931a9c02756460a4e38a9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithPermissions.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithPermissions.json
index 29cbe82db8ef..7c49aab3d2d0 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithPermissions.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASEnqueueDequeueWithPermissions.json
@@ -1,112 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65aff66379312fa28275402a425899",
+    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "01459cd9-fbc5-4184-b500-e37925a1cff5"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "275b5efa-996f-4ccd-824e-d45e1d338462"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "42b6e12d-2003-0073-0421-41aeb2000000",
-      "x-ms-client-request-id" : "01459cd9-fbc5-4184-b500-e37925a1cff5",
-      "Date" : "Tue, 04 May 2021 20:07:40 GMT"
+      "x-ms-request-id" : "40e62661-6003-000d-4f0c-491216000000",
+      "x-ms-client-request-id" : "275b5efa-996f-4ccd-824e-d45e1d338462",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65aff66379312fa28275402a425899/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "46614f2f-d039-40e5-8d89-b711366ca1ea",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6faab1e6-cdd3-4149-9c8a-e24963a21111",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "42b6e13b-2003-0073-0f21-41aeb2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e470b8eb-2678-4ef3-8df1-5cf30382ff2a</MessageId><InsertionTime>Tue, 04 May 2021 20:07:40 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:07:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAa60NIyFB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:07:40 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "46614f2f-d039-40e5-8d89-b711366ca1ea",
-      "Date" : "Tue, 04 May 2021 20:07:40 GMT",
+      "x-ms-request-id" : "b7c71e77-8003-0077-410c-490f56000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>65833ca3-28d9-4a31-b4e6-ca227597d59b</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAPz15JgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "6faab1e6-cdd3-4149-9c8a-e24963a21111",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65aff66379312fa28275402a425899/messages?sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A07%3A41Z&se=2021-05-05T20%3A07%3A41Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7/messages?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "312031a7-ffeb-4082-ae26-a361c4cb528e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "03a024f9-7bcc-4584-bf0a-786065ff5930",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "42b6e14d-2003-0073-2121-41aeb2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>b4b285ac-8a18-4bd4-8b99-98f63a2b1c25</MessageId><InsertionTime>Tue, 04 May 2021 20:07:41 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:07:41 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAl/8vIyFB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:07:41 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "312031a7-ffeb-4082-ae26-a361c4cb528e",
-      "Date" : "Tue, 04 May 2021 20:07:40 GMT",
+      "x-ms-request-id" : "07c75f67-9003-0054-100c-499595000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>cede2521-3e76-4603-981f-48ce4ed8b322</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA3p2OJgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "03a024f9-7bcc-4584-bf0a-786065ff5930",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65aff66379312fa28275402a425899/messages?numofmessages=2&visibilitytimeout=30&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A07%3A41Z&se=2021-05-05T20%3A07%3A41Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7/messages?numofmessages=2&visibilitytimeout=30&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "957a0281-5593-41d4-94b0-6a870ef2fa50"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5bbbf517-4498-4cb0-bfdd-f182e1ddefc5"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "42b6e151-2003-0073-2521-41aeb2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>e470b8eb-2678-4ef3-8df1-5cf30382ff2a</MessageId><InsertionTime>Tue, 04 May 2021 20:07:40 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:07:40 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAANd8iNSFB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:08:11 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>b4b285ac-8a18-4bd4-8b99-98f63a2b1c25</MessageId><InsertionTime>Tue, 04 May 2021 20:07:41 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:07:41 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAANd8iNSFB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:08:11 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "957a0281-5593-41d4-94b0-6a870ef2fa50",
-      "Date" : "Tue, 04 May 2021 20:07:40 GMT",
+      "x-ms-request-id" : "353bf759-0003-008d-5f0c-49ed10000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>65833ca3-28d9-4a31-b4e6-ca227597d59b</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAoMiFOAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>cede2521-3e76-4603-981f-48ce4ed8b322</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAoMiFOAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:06 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "5bbbf517-4498-4cb0-bfdd-f182e1ddefc5",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65aff66379312fa28275402a425899/messages/e470b8eb-2678-4ef3-8df1-5cf30382ff2a?popreceipt=AgAAAAMAAAAAAAAAa60NIyFB1wE%3D&visibilitytimeout=3600&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A07%3A41Z&se=2021-05-05T20%3A07%3A41Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7/messages/65833ca3-28d9-4a31-b4e6-ca227597d59b?popreceipt=AgAAAAMAAAAAAAAAPz15JgxJ1wE%3D&visibilitytimeout=3600&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4f940922-1328-4e72-a2ae-d84b8e0dc91e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1efd2cca-05d9-45cc-8907-e1cabacd625b",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "42b6e156-2003-0073-2a21-41aeb2000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:42b6e156-2003-0073-2a21-41aeb2000000\nTime:2021-05-04T20:07:41.3219153Z</Message></Error>",
-      "x-ms-client-request-id" : "4f940922-1328-4e72-a2ae-d84b8e0dc91e",
-      "Date" : "Tue, 04 May 2021 20:07:40 GMT",
+      "x-ms-request-id" : "353bf764-0003-008d-670c-49ed10000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:353bf764-0003-008d-670c-49ed10000000\nTime:2021-05-14T21:57:37.1146027Z</Message></Error>",
+      "x-ms-client-request-id" : "1efd2cca-05d9-45cc-8907-e1cabacd625b",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "0d6c65af0d6c65aff66379312fa28275402a425899", "2021-05-04T20:07:41.096553500Z", "2021-05-04T20:07:41.106553700Z", "0d6c65af0d6c65aff66919340f5afaa16a7e44ca93" ]
+  "variables" : [ "0d6c65af0d6c65afbdc659003bcffb3d36f747c5b7", "2021-05-14T21:57:36.632824100Z", "2021-05-14T21:57:36.632824100Z", "0d6c65af0d6c65afbdc26465025e21470be14bad9c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParseIA.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParseIA.json
index 852fa401b4cd..ffbad99ae6a1 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParseIA.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParseIA.json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "bcf73627bcf736278620947739722ff8f59f40a38c" ]
+  "variables" : [ "bcf73627bcf736278a030573f6e6bd4e061641eba1" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[0].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[0].json
index 135ec1bcc266..2595f6cbeb31 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[0].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[0].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "4be8bf304be8bf304df73948567a199c2f884d02a9" ]
+  "variables" : [ "4be8bf304be8bf30fe10528508938acf2db1404fae" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[1].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[1].json
index 43d35ea905ac..13dec516e52a 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[1].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[1].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "52f38e7152f38e71ca5793370a2f66d62b1e49eaaf" ]
+  "variables" : [ "52f38e7152f38e712809594438fff6d4a08a4ba985" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[2].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[2].json
index b1c580851d75..a77074cf4873 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[2].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[2].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "79deddb279deddb29fd744879cc36dbcb7444c4b95" ]
+  "variables" : [ "79deddb279deddb2ccb703072bf077154a5b4f6091" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[3].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[3].json
index cba297fd2756..782f7064b3b0 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[3].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[3].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "60c5ecf360c5ecf31c37797671db263cde5f41008c" ]
+  "variables" : [ "60c5ecf360c5ecf370901766ffd3c5ff70e84f248a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[4].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[4].json
index 758fb1a87afe..75cc210957b6 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[4].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[4].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "2f847a342f847a34ba48525442d1721119a54a5696" ]
+  "variables" : [ "2f847a342f847a349ee82444e67ea042aeec4fe8a2" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[5].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[5].json
index 882ca3bae2d2..93a361938a9c 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[5].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[5].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "369f4b75369f4b755b58567728c1d8af0cab4e7ab4" ]
+  "variables" : [ "369f4b75369f4b75c137633717b1586a4f4d4ce6b6" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[6].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[6].json
index f356beb1b4dc..f65ae8b3174d 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[6].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[6].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "1db218b61db218b66db88056be1aba3983164127be" ]
+  "variables" : [ "1db218b61db218b637356294963cb505f6e64ceca6" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[7].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[7].json
index c88d857fbe02..9c2d38c91e5b 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[7].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionParse[7].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "04a929f704a929f746761211c8dd5b79e7dc4e6496" ]
+  "variables" : [ "04a929f704a929f7bf63360022c4730a9af44afda4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[0].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[0].json
index 8639afa202e1..b88e80d2137d 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[0].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[0].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "7ef28f5e7ef28f5e4e5262919801691bc0054e0792" ]
+  "variables" : [ "7ef28f5e7ef28f5e40c735399cabb37b4811439693" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[1].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[1].json
index 6bbb439829b1..574885229369 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[1].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[1].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "67e9be1f67e9be1f6cc171824435ed6b8461400491" ]
+  "variables" : [ "67e9be1f67e9be1fec956479809c8126011f41fc94" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[2].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[2].json
index 92d58f0ab1b2..3a9380ebb456 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[2].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[2].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "4cc4eddc4cc4eddcc8819462adfc3d0b420442cabd" ]
+  "variables" : [ "4cc4eddc4cc4eddcade213809b664817980a46c88a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[3].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[3].json
index 7fd3ab102fc9..fda1281a80cc 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[3].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[3].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "55dfdc9d55dfdc9d28890840bd771a15fae1415abf" ]
+  "variables" : [ "55dfdc9d55dfdc9d1cc0026878808c448d624db285" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[4].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[4].json
index 8f10952a2c2e..37bb524470e2 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[4].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[4].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "1a9e4a5a1a9e4a5a8ec49695478c1656422d4afc8d" ]
+  "variables" : [ "1a9e4a5a1a9e4a5a93452966426f23cb51fe4a50b0" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[5].json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[5].json
index fd60c66a343d..6478a88b7279 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[5].json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASPermissionToString[5].json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "03857b1b03857b1b13815652c16f0799aef34f12a1" ]
+  "variables" : [ "03857b1b03857b1bdb094145c7b29b6efb91404381" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASUpdateDeleteWithPermissions.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASUpdateDeleteWithPermissions.json
index 7600e4b750e6..b56e7fc3a15e 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASUpdateDeleteWithPermissions.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueSASUpdateDeleteWithPermissions.json
@@ -1,111 +1,111 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c07535da5122500bfec24d5944a3eba",
+    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c0753af621932ead01e4bd6cc43ce82",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6a4864cb-9c31-4f63-a016-ef541c9f2a1b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "40193197-58d3-4782-92cd-b550b08d3bb9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b49c95ae-b003-003c-1a20-41dfe6000000",
-      "x-ms-client-request-id" : "6a4864cb-9c31-4f63-a016-ef541c9f2a1b",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "353bf723-0003-008d-340c-49ed10000000",
+      "x-ms-client-request-id" : "40193197-58d3-4782-92cd-b550b08d3bb9",
+      "Date" : "Fri, 14 May 2021 21:57:35 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c07535da5122500bfec24d5944a3eba/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c0753af621932ead01e4bd6cc43ce82/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b34ba10b-d771-4407-ba5e-de4253197411",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cc28e49f-8c7d-49e9-9b4f-6057f9b4d8dc",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "785dfb5b-3003-000d-7020-413ef5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>aa867f4d-a3ea-4fb7-be8e-ebba9c3af216</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALSC9XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "b34ba10b-d771-4407-ba5e-de4253197411",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "1aa63b8e-1003-0081-010c-497a18000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7f9a5b21-72ad-4e27-bc75-1d3eb2689b29</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAiJuFJgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:36 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "cc28e49f-8c7d-49e9-9b4f-6057f9b4d8dc",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c07535da5122500bfec24d5944a3eba/messages/aa867f4d-a3ea-4fb7-be8e-ebba9c3af216?popreceipt=AgAAAAMAAAAAAAAALSC9XyBB1wE%3D&visibilitytimeout=0&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c0753af621932ead01e4bd6cc43ce82/messages/7f9a5b21-72ad-4e27-bc75-1d3eb2689b29?popreceipt=AgAAAAMAAAAAAAAAiJuFJgxJ1wE%3D&visibilitytimeout=0&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7248eab7-5d2a-47bd-bc6e-ae08606b11f6",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "865a15cf-a33d-439c-bea7-aadbebe29803",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-time-next-visible" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-time-next-visible" : "Fri, 14 May 2021 21:57:37 GMT",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "53b7bc0c-5003-00a2-2f20-41cc38000000",
-      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAArmnaXyBB1wEAAAAA",
-      "x-ms-client-request-id" : "7248eab7-5d2a-47bd-bc6e-ae08606b11f6",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "1aa63bd9-1003-0081-380c-497a18000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAAdiPOJgxJ1wEAAAAA",
+      "x-ms-client-request-id" : "865a15cf-a33d-439c-bea7-aadbebe29803",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c07535da5122500bfec24d5944a3eba/messages?numofmessages=1&visibilitytimeout=30&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c0753af621932ead01e4bd6cc43ce82/messages?numofmessages=1&visibilitytimeout=30&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3362704b-e6b9-49dd-a804-a904169ff969"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8334cd91-10bb-41ae-b8a6-e243ac98d358"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "5c6417ba-c003-00d2-6520-4175cf000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>aa867f4d-a3ea-4fb7-be8e-ebba9c3af216</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAnkDIcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>testing</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "3362704b-e6b9-49dd-a804-a904169ff969",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "1aa63be6-1003-0081-420c-497a18000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7f9a5b21-72ad-4e27-bc75-1d3eb2689b29</MessageId><InsertionTime>Fri, 14 May 2021 21:57:36 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:57:36 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAfV29OAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:58:07 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>testing</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "8334cd91-10bb-41ae-b8a6-e243ac98d358",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c07535da5122500bfec24d5944a3eba?sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/237c0753237c0753af621932ead01e4bd6cc43ce82?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A57%3A36Z&se=2021-05-15T21%3A57%3A36Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "456e2308-18f8-4a6d-81b3-35a161cea7da"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8f4f13e9-1e46-44e0-8c71-6dd8fc01441c"
     },
     "Response" : {
       "content-length" : "246",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationFailure",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "b49c95f3-b003-003c-5520-41dfe6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationFailure</Code><Message>This request is not authorized to perform this operation.\nRequestId:b49c95f3-b003-003c-5520-41dfe6000000\nTime:2021-05-04T20:02:13.5371098Z</Message></Error>",
-      "x-ms-client-request-id" : "456e2308-18f8-4a6d-81b3-35a161cea7da",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "07c75fc6-9003-0054-620c-499595000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationFailure</Code><Message>This request is not authorized to perform this operation.\nRequestId:07c75fc6-9003-0054-620c-499595000000\nTime:2021-05-14T21:57:37.1951429Z</Message></Error>",
+      "x-ms-client-request-id" : "8f4f13e9-1e46-44e0-8c71-6dd8fc01441c",
+      "Date" : "Fri, 14 May 2021 21:57:36 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "237c0753237c07535da5122500bfec24d5944a3eba", "2021-05-04T20:02:13.386793400Z", "2021-05-04T20:02:13.386793400Z", "237c0753237c07535da792898040bb334094498eb4" ]
+  "variables" : [ "237c0753237c0753af621932ead01e4bd6cc43ce82", "2021-05-14T21:57:36.708820700Z", "2021-05-14T21:57:36.709820300Z", "237c0753237c0753af65551436a13d7d929e497c87" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueServiceSASCanonicalizedResource.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueServiceSASCanonicalizedResource.json
index a0f94ef6c7b6..7679e6c2ca36 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueServiceSASCanonicalizedResource.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsQueueServiceSASCanonicalizedResource.json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "3d6758323d675832ce7261717d34b7a6e9f643dc84" ]
+  "variables" : [ "3d6758323d67583288028991e3090f5c350941c0af" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASCreateQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASCreateQueue.json
index 70a7b51db628..070950a4d908 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASCreateQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASCreateQueue.json
@@ -1,83 +1,83 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d937e59125508d4860f2cca34",
+    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d9379be702689949d198ff764",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "30494432-6c8e-4238-9d24-f0615514c429"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "97d93e36-8ed8-44f7-8eb4-0a525b4c371b"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8d2d9a84-4003-0091-7e20-419393000000",
-      "x-ms-client-request-id" : "30494432-6c8e-4238-9d24-f0615514c429",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "7d8175f6-7003-003e-2d0b-494dbd000000",
+      "x-ms-client-request-id" : "97d93e36-8ed8-44f7-8eb4-0a525b4c371b",
+      "Date" : "Fri, 14 May 2021 21:56:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d937e59125508d4860f2cca34/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d9379be702689949d198ff764/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "72ed287b-a2ad-44a8-97ed-c35339c9f97a",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "86b834df-1449-442b-916f-c7c1c585c1e2",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "53b7bc08-5003-00a2-2c20-41cc38000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>97bbb917-8e52-4258-8b1f-85c7cc93918e</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAUpW9XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "72ed287b-a2ad-44a8-97ed-c35339c9f97a",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "e2cc853c-2003-0041-620b-498226000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>c49bcf31-7e8e-42f1-8934-99a369db378d</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARDyy+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "86b834df-1449-442b-916f-c7c1c585c1e2",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d937e5979143b3667d91eb0e4?sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A13Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d9379be38561c4196c5a52bd4?sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A56%3A23Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "8a14dc39-5db4-44ec-9089-f20af450d964"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "46c1088f-5abf-4c48-94c8-f5748fd01eb6"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8d2d9a9d-4003-0091-1220-419393000000",
-      "x-ms-client-request-id" : "8a14dc39-5db4-44ec-9089-f20af450d964",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT"
+      "x-ms-request-id" : "a8e76a0a-9003-0036-0d0b-4957b2000000",
+      "x-ms-client-request-id" : "46c1088f-5abf-4c48-94c8-f5748fd01eb6",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d937e5979143b3667d91eb0e4?sv=2020-08-04&ss=q&srt=sco&se=2021-05-05T20%3A02%3A13Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/5053d9375053d9379be38561c4196c5a52bd4?sv=2020-10-02&ss=q&srt=sco&se=2021-05-15T21%3A56%3A23Z&sp=rdc&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9f0a6b4a-705c-4383-a1f6-b68485a5bc0a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0d5e0d28-33d7-4275-884c-50ea07cf74b9"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "8d2d9aab-4003-0091-1f20-419393000000",
-      "x-ms-client-request-id" : "9f0a6b4a-705c-4383-a1f6-b68485a5bc0a",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT"
+      "x-ms-request-id" : "a8e76a16-9003-0036-170b-4957b2000000",
+      "x-ms-client-request-id" : "0d5e0d28-33d7-4275-884c-50ea07cf74b9",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   } ],
-  "variables" : [ "5053d9375053d937e59125508d4860f2cca34", "2021-05-04T20:02:13.379794200Z", "5053d9375053d937e5979143b3667d91eb0e4" ]
+  "variables" : [ "5053d9375053d9379be702689949d198ff764", "2021-05-14T21:56:23.277848400Z", "5053d9375053d9379be38561c4196c5a52bd4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASListQueues.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASListQueues.json
index 84db7233badc..6756dfcf003d 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASListQueues.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsAccountSASListQueues.json
@@ -1,45 +1,45 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/a8c5be13a8c5be138684256577f2a2e4a1d94",
+    "Uri" : "https://REDACTED.queue.core.windows.net/a8c5be13a8c5be13a2c03997e51e87e7d2c14",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5a41a507-6939-4255-9031-c2faf7ef28cc"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3136bbac-480e-4e76-a439-8bd07fd49e35"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "721d902c-4003-005a-2b09-4190c6000000",
-      "x-ms-client-request-id" : "5a41a507-6939-4255-9031-c2faf7ef28cc",
-      "Date" : "Tue, 04 May 2021 17:18:36 GMT"
+      "x-ms-request-id" : "e2cc84ed-2003-0041-1d0b-498226000000",
+      "x-ms-client-request-id" : "3136bbac-480e-4e76-a439-8bd07fd49e35",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/a8c5be13a8c5be138684256577f2a2e4a1d94/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/a8c5be13a8c5be13a2c03997e51e87e7d2c14/messages",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "7052fd09-97e0-49cd-a432-3b211a2ee27e",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8ae7f1ef-f32a-401f-a7e5-14100a40250e",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "90ba118a-f003-00bb-3709-414c83000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>dc0002db-0845-45e9-aa9d-a9a8248af1d0</MessageId><InsertionTime>Tue, 04 May 2021 17:18:37 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 17:18:37 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAZxwVhQlB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 17:18:37 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "7052fd09-97e0-49cd-a432-3b211a2ee27e",
-      "Date" : "Tue, 04 May 2021 17:18:36 GMT",
+      "x-ms-request-id" : "aeea6bee-6003-0050-130b-491892000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7f61b5d7-fe1e-4413-85a2-60b5ebb4daaf</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALhWy+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "8ae7f1ef-f32a-401f-a7e5-14100a40250e",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "a8c5be13a8c5be138684256577f2a2e4a1d94", "2021-05-04T17:18:37.727906400Z" ]
+  "variables" : [ "a8c5be13a8c5be13a2c03997e51e87e7d2c14", "2021-05-14T21:56:23.275846800Z" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithId.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithId.json
index cd9f209316a6..7e14a09ddacf 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithId.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithId.json
@@ -1,109 +1,109 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451afff73042876630012c7fbb4",
+    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451affdb705981b134bec520c14",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "548cb781-9c25-437c-a56a-163e62db7d6c"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "beeb2a18-ba35-404d-b87a-f0161de2fc40"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "53b7bbf3-5003-00a2-1920-41cc38000000",
-      "x-ms-client-request-id" : "548cb781-9c25-437c-a56a-163e62db7d6c",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "aeea6ba3-6003-0050-530b-491892000000",
+      "x-ms-client-request-id" : "beeb2a18-ba35-404d-b87a-f0161de2fc40",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451afff73042876630012c7fbb4/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451affdb705981b134bec520c14/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1ae18207-b45a-4cba-96d1-55fb4bba2c63",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "831fc0de-0135-4e34-8a75-86b68adee7a4",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "6e3f044d-d003-00bc-7120-4120e0000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>16d54f24-a76d-4f83-8850-9f9f996ef6c6</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAUZW9XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "1ae18207-b45a-4cba-96d1-55fb4bba2c63",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "a8e769df-9003-0036-680b-4957b2000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d6d49748-815a-4ee5-a2da-bc96272fb43d</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALxWy+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "831fc0de-0135-4e34-8a75-86b68adee7a4",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451afff73042876630012c7fbb4?comp=acl",
+    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451affdb705981b134bec520c14?comp=acl",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "78cfbba5-fc28-4c86-893d-0a377b048815",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c9aedb87-2202-458a-bec8-5cbec533692a",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "b49c95e0-b003-003c-4720-41dfe6000000",
-      "x-ms-client-request-id" : "78cfbba5-fc28-4c86-893d-0a377b048815",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "20c2b7a1-9003-0009-130b-499f11000000",
+      "x-ms-client-request-id" : "c9aedb87-2202-458a-bec8-5cbec533692a",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451afff73042876630012c7fbb4/messages?sv=2020-08-04&si=560e9069-570b-4a27-9426-388c1a69e275&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451affdb705981b134bec520c14/messages?sv=2020-10-02&si=4ebe99e7-9cd2-4955-81af-3871c7b44a16&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9db35be3-3d80-4fd6-92f9-6dc209105ff2",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0aefd582-cb1d-48a2-8738-3431734e9de3",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "8d2da040-4003-0091-0d20-419393000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>5ea694da-29b3-43ab-86be-c5e839028ca7</MessageId><InsertionTime>Tue, 04 May 2021 20:02:43 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbT/RcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "9db35be3-3d80-4fd6-92f9-6dc209105ff2",
-      "Date" : "Tue, 04 May 2021 20:02:43 GMT",
+      "x-ms-request-id" : "e2cc99c8-2003-0041-370c-498226000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f61eef36-3e6b-4bf3-bfc4-528002674bac</MessageId><InsertionTime>Fri, 14 May 2021 21:56:53 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:53 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAA1P7bDAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:53 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "0aefd582-cb1d-48a2-8738-3431734e9de3",
+      "Date" : "Fri, 14 May 2021 21:56:53 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451afff73042876630012c7fbb4/messages?numofmessages=2&visibilitytimeout=30&sv=2020-08-04&si=560e9069-570b-4a27-9426-388c1a69e275&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/43451aff43451affdb705981b134bec520c14/messages?numofmessages=2&visibilitytimeout=30&sv=2020-10-02&si=4ebe99e7-9cd2-4955-81af-3871c7b44a16&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "bf097d38-b845-41b9-887b-7e6ef9f330e0"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c287090a-1159-452d-b8ac-d4140147370d"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "1d52a70e-1003-009c-4420-415b47000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>16d54f24-a76d-4f83-8850-9f9f996ef6c6</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALofBgyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:03:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>5ea694da-29b3-43ab-86be-c5e839028ca7</MessageId><InsertionTime>Tue, 04 May 2021 20:02:43 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:43 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAALofBgyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:03:13 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "bf097d38-b845-41b9-887b-7e6ef9f330e0",
-      "Date" : "Tue, 04 May 2021 20:02:43 GMT",
+      "x-ms-request-id" : "e2cc99db-2003-0041-460c-498226000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>d6d49748-815a-4ee5-a2da-bc96272fb43d</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbRnHHgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:23 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>f61eef36-3e6b-4bf3-bfc4-528002674bac</MessageId><InsertionTime>Fri, 14 May 2021 21:56:53 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:53 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAbRnHHgxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:57:23 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "c287090a-1159-452d-b8ac-d4140147370d",
+      "Date" : "Fri, 14 May 2021 21:56:53 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "43451aff43451afff73042876630012c7fbb4", "2021-05-04T20:02:13.385793300Z", "2021-05-04T20:02:13.391792600Z", "560e9069-570b-4a27-9426-388c1a69e275", "43451aff43451afff73511248b8dff40c8964220ac" ]
+  "variables" : [ "43451aff43451affdb705981b134bec520c14", "2021-05-14T21:56:23.262848100Z", "2021-05-14T21:56:23.278849500Z", "4ebe99e7-9cd2-4955-81af-3871c7b44a16", "43451aff43451affdb7667492247810fbf1a41f6b4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithPerm.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithPerm.json
index a9dfd9ba5265..dd0fa7bdaf1e 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithPerm.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASEnqueueWithPerm.json
@@ -1,112 +1,112 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101847404658ec71d8c75564",
+    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101f09356469fae92a56bcb4",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5fd45b79-ad06-469d-9871-2b37b49526a7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e7be3ff5-84a8-43c5-b3c0-93089395ff5e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "5c64178c-c003-00d2-3c20-4175cf000000",
-      "x-ms-client-request-id" : "5fd45b79-ad06-469d-9871-2b37b49526a7",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "a8e76995-9003-0036-2c0b-4957b2000000",
+      "x-ms-client-request-id" : "e7be3ff5-84a8-43c5-b3c0-93089395ff5e",
+      "Date" : "Fri, 14 May 2021 21:56:21 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101847404658ec71d8c75564/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101f09356469fae92a56bcb4/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "031a9e13-a6b1-43a1-8d0d-cc41daae3a47",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "855a5e22-558f-4abe-a283-4b45cf612661",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b4b07000-f003-00ab-1020-4189eb000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c2137ad-fbbc-4408-bdde-f6d73c60d946</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAARm69XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "031a9e13-a6b1-43a1-8d0d-cc41daae3a47",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "20c2b72d-9003-0009-270b-499f11000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>064fb5a2-2fd8-40d8-834a-56054d4b086c</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAQzyy+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "855a5e22-558f-4abe-a283-4b45cf612661",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101847404658ec71d8c75564/messages?sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101f09356469fae92a56bcb4/messages?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9e2d4321-d102-49c2-974e-e51a0a1ff7e5",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f9a68de5-b88e-4f74-a256-356e4694d325",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b4b07005-f003-00ab-1420-4189eb000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>f90e5092-8705-4962-b696-8529fe841314</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAozXXXyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "9e2d4321-d102-49c2-974e-e51a0a1ff7e5",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "e2cc856b-2003-0041-070b-498226000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>be6311cb-6ab0-4318-88b3-d1ce545da861</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAY6XX+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "f9a68de5-b88e-4f74-a256-356e4694d325",
+      "Date" : "Fri, 14 May 2021 21:56:23 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101847404658ec71d8c75564/messages?numofmessages=2&visibilitytimeout=30&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101f09356469fae92a56bcb4/messages?numofmessages=2&visibilitytimeout=30&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "003cbd41-86de-4164-aaf8-5bf0fd29655f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "20f4a70f-8132-42a1-b688-cd8a1ebd51ea"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "b4b07006-f003-00ab-1520-4189eb000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>6c2137ad-fbbc-4408-bdde-f6d73c60d946</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAABWzGcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>f90e5092-8705-4962-b696-8529fe841314</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAABWzGcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "003cbd41-86de-4164-aaf8-5bf0fd29655f",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "aeea6c1a-6003-0050-390b-491892000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>064fb5a2-2fd8-40d8-834a-56054d4b086c</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEkPGDAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:53 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>test</MessageText></QueueMessage><QueueMessage><MessageId>be6311cb-6ab0-4318-88b3-d1ce545da861</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAEkPGDAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:53 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>sastest</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "20f4a70f-8132-42a1-b688-cd8a1ebd51ea",
+      "Date" : "Fri, 14 May 2021 21:56:23 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101847404658ec71d8c75564/messages/6c2137ad-fbbc-4408-bdde-f6d73c60d946?popreceipt=AgAAAAMAAAAAAAAARm69XyBB1wE%3D&visibilitytimeout=3600&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=rap&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/2d4621012d462101f09356469fae92a56bcb4/messages/064fb5a2-2fd8-40d8-834a-56054d4b086c?popreceipt=AgAAAAMAAAAAAAAAQzyy%2BgtJ1wE%3D&visibilitytimeout=3600&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=rap&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "466d1c28-6324-4d1b-963b-cc5899b6e857",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "723e3f56-c88c-48ac-b222-f03f697605e4",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "279",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationPermissionMismatch",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "8d2d9ab7-4003-0091-2820-419393000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:8d2d9ab7-4003-0091-2820-419393000000\nTime:2021-05-04T20:02:13.5380358Z</Message></Error>",
-      "x-ms-client-request-id" : "466d1c28-6324-4d1b-963b-cc5899b6e857",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-request-id" : "7d81765c-7003-003e-050b-494dbd000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationPermissionMismatch</Code><Message>This request is not authorized to perform this operation using this permission.\nRequestId:7d81765c-7003-003e-050b-494dbd000000\nTime:2021-05-14T21:56:23.4606196Z</Message></Error>",
+      "x-ms-client-request-id" : "723e3f56-c88c-48ac-b222-f03f697605e4",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "2d4621012d462101847404658ec71d8c75564", "2021-05-04T20:02:13.386793400Z", "2021-05-04T20:02:13.393793800Z", "2d4621012d46210184700207200bc60e9a2349a0bf" ]
+  "variables" : [ "2d4621012d462101f09356469fae92a56bcb4", "2021-05-14T21:56:23.264848100Z", "2021-05-14T21:56:23.298847300Z", "2d4621012d462101f09610095aed31d0eab248b98c" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASUpdateWithPerm.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASUpdateWithPerm.json
index 308bf96cb2f9..a09655b08525 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASUpdateWithPerm.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSasClientTestsQueueSASUpdateWithPerm.json
@@ -1,111 +1,111 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702fa4f30423978673c331734",
+    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702ff569887853e1a39c737a4",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0338a19c-2bd6-410c-a7ff-b79f8c19a0ac"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "20758de7-a360-463e-a499-1a809434533e"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "785dfb47-3003-000d-6020-413ef5000000",
-      "x-ms-client-request-id" : "0338a19c-2bd6-410c-a7ff-b79f8c19a0ac",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT"
+      "x-ms-request-id" : "20c2b670-9003-0009-770b-499f11000000",
+      "x-ms-client-request-id" : "20758de7-a360-463e-a499-1a809434533e",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702fa4f30423978673c331734/messages",
+    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702ff569887853e1a39c737a4/messages",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "a4f6aa35-cb95-4fbe-8e94-3dcf4b47a1e4",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ae42a373-2153-4465-b1b2-b7a5e5e41ea8",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "5c6417ad-c003-00d2-5920-4175cf000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7007c7f3-1d85-47dc-a5ec-a640dcc9d52d</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAR269XyBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:13 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "a4f6aa35-cb95-4fbe-8e94-3dcf4b47a1e4",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "7d817622-7003-003e-520b-494dbd000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3b9134ee-3680-4643-9a92-ce732861ef32</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAQjyy+gtJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:23 GMT</TimeNextVisible></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "ae42a373-2153-4465-b1b2-b7a5e5e41ea8",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702fa4f30423978673c331734/messages/7007c7f3-1d85-47dc-a5ec-a640dcc9d52d?popreceipt=AgAAAAMAAAAAAAAAR269XyBB1wE%3D&visibilitytimeout=0&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702ff569887853e1a39c737a4/messages/3b9134ee-3680-4643-9a92-ce732861ef32?popreceipt=AgAAAAMAAAAAAAAAQjyy%2BgtJ1wE%3D&visibilitytimeout=0&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d50f579c-9c49-4e62-9361-928b73c9dced",
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6a719857-be81-43a6-b980-afe5a9abf6ab",
       "Content-Type" : "application/xml"
     },
     "Response" : {
       "content-length" : "0",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-time-next-visible" : "Tue, 04 May 2021 20:02:13 GMT",
+      "x-ms-time-next-visible" : "Fri, 14 May 2021 21:56:23 GMT",
       "retry-after" : "0",
       "StatusCode" : "204",
-      "x-ms-request-id" : "6e3f0458-d003-00bc-7920-4120e0000000",
-      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAArmnaXyBB1wEAAAAA",
-      "x-ms-client-request-id" : "d50f579c-9c49-4e62-9361-928b73c9dced",
-      "Date" : "Tue, 04 May 2021 20:02:13 GMT"
+      "x-ms-request-id" : "7d817641-7003-003e-6f0b-494dbd000000",
+      "x-ms-popreceipt" : "AwAAAAMAAAAAAAAA/xLc+gtJ1wEAAAAA",
+      "x-ms-client-request-id" : "6a719857-be81-43a6-b980-afe5a9abf6ab",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702fa4f30423978673c331734/messages?numofmessages=1&visibilitytimeout=30&sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702ff569887853e1a39c737a4/messages?numofmessages=1&visibilitytimeout=30&sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5a98c2c8-094b-417d-894a-fe74d2a261ba"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7a8eb054-354a-4903-887b-29a2c0bd04da"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Cache-Control" : "no-cache",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "53b7bc11-5003-00a2-3220-41cc38000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>7007c7f3-1d85-47dc-a5ec-a640dcc9d52d</MessageId><InsertionTime>Tue, 04 May 2021 20:02:13 GMT</InsertionTime><ExpirationTime>Tue, 11 May 2021 20:02:13 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAAw7XIcSBB1wE=</PopReceipt><TimeNextVisible>Tue, 04 May 2021 20:02:43 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>testing</MessageText></QueueMessage></QueueMessagesList>",
-      "x-ms-client-request-id" : "5a98c2c8-094b-417d-894a-fe74d2a261ba",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "7d81764f-7003-003e-7a0b-494dbd000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><QueueMessagesList><QueueMessage><MessageId>3b9134ee-3680-4643-9a92-ce732861ef32</MessageId><InsertionTime>Fri, 14 May 2021 21:56:23 GMT</InsertionTime><ExpirationTime>Fri, 21 May 2021 21:56:23 GMT</ExpirationTime><PopReceipt>AgAAAAMAAAAAAAAADvHHDAxJ1wE=</PopReceipt><TimeNextVisible>Fri, 14 May 2021 21:56:53 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>testing</MessageText></QueueMessage></QueueMessagesList>",
+      "x-ms-client-request-id" : "7a8eb054-354a-4903-887b-29a2c0bd04da",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702fa4f30423978673c331734?sv=2020-08-04&spr=https%2Chttp&st=2021-05-03T20%3A02%3A13Z&se=2021-05-05T20%3A02%3A13Z&sp=raup&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/3797702f3797702ff569887853e1a39c737a4?sv=2020-10-02&spr=https%2Chttp&st=2021-05-13T21%3A56%3A23Z&se=2021-05-15T21%3A56%3A23Z&sp=raup&sig=REDACTED",
     "Headers" : {
-      "x-ms-version" : "2020-08-04",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "95431545-1275-4a7b-b6f8-80afd614c6bd"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.10.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "599453c5-d8af-48ad-b37e-ddb1f5d64b31"
     },
     "Response" : {
       "content-length" : "246",
-      "x-ms-version" : "2020-08-04",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
       "x-ms-error-code" : "AuthorizationFailure",
       "retry-after" : "0",
       "StatusCode" : "403",
-      "x-ms-request-id" : "785dfb7c-3003-000d-0d20-413ef5000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationFailure</Code><Message>This request is not authorized to perform this operation.\nRequestId:785dfb7c-3003-000d-0d20-413ef5000000\nTime:2021-05-04T20:02:13.5344954Z</Message></Error>",
-      "x-ms-client-request-id" : "95431545-1275-4a7b-b6f8-80afd614c6bd",
-      "Date" : "Tue, 04 May 2021 20:02:12 GMT",
+      "x-ms-request-id" : "20c2b7f2-9003-0009-610b-499f11000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthorizationFailure</Code><Message>This request is not authorized to perform this operation.\nRequestId:20c2b7f2-9003-0009-610b-499f11000000\nTime:2021-05-14T21:56:23.4617991Z</Message></Error>",
+      "x-ms-client-request-id" : "599453c5-d8af-48ad-b37e-ddb1f5d64b31",
+      "Date" : "Fri, 14 May 2021 21:56:22 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "3797702f3797702fa4f30423978673c331734", "2021-05-04T20:02:13.386793400Z", "2021-05-04T20:02:13.393793800Z", "3797702f3797702fa4f7419182bfaa11bc894e0cb8" ]
+  "variables" : [ "3797702f3797702ff569887853e1a39c737a4", "2021-05-14T21:56:23.263848700Z", "2021-05-14T21:56:23.297846800Z", "3797702f3797702ff5675318e72b5f3dad344392a3" ]
 }
\ No newline at end of file

From 8b491367b42b893a621c8e576b7a31dec169286e Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Wed, 19 May 2021 10:32:40 -0700
Subject: [PATCH 2/9] Generated off latest version of blob swagger (#21644)

---
 .../blob/implementation/AppendBlobsImpl.java  |   15 +
 .../AzureBlobStorageImplBuilder.java          |    2 +-
 .../blob/implementation/BlobsImpl.java        |  164 +++
 .../blob/implementation/BlockBlobsImpl.java   |   29 +
 .../blob/implementation/PageBlobsImpl.java    |   15 +
 .../models/BlobImmutabilityPolicyMode.java    |   50 +
 .../models/BlobItemPropertiesInternal.java    |   85 ++
 .../BlobsDeleteImmutabilityPolicyHeaders.java |  127 ++
 ...BlobsDeleteImmutabilityPolicyResponse.java |   31 +
 .../models/BlobsDownloadHeaders.java          |   85 ++
 .../models/BlobsGetPropertiesHeaders.java     | 1020 +++++++++--------
 .../BlobsSetImmutabilityPolicyHeaders.java    |  188 +++
 .../BlobsSetImmutabilityPolicyResponse.java   |   30 +
 .../models/BlobsSetLegalHoldHeaders.java      |  153 +++
 .../models/BlobsSetLegalHoldResponse.java     |   26 +
 .../ContainersGetPropertiesHeaders.java       |   29 +
 .../models/BlobContainerItemProperties.java   |   29 +
 .../storage/blob/models/BlobErrorCode.java    |    4 +
 .../blob/models/ListBlobsIncludeItem.java     |    8 +-
 .../specialized/AppendBlobAsyncClient.java    |    4 +-
 .../blob/specialized/BlobAsyncClientBase.java |    4 +-
 .../specialized/BlockBlobAsyncClient.java     |    8 +-
 .../blob/specialized/PageBlobAsyncClient.java |    2 +-
 .../azure-storage-blob/swagger/README.md      |    2 +-
 24 files changed, 1631 insertions(+), 479 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyResponse.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldHeaders.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldResponse.java

diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
index 9c2cd6534773..0f5b9bea4d58 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
@@ -24,6 +24,7 @@
 import com.azure.storage.blob.implementation.models.AppendBlobsAppendBlockResponse;
 import com.azure.storage.blob.implementation.models.AppendBlobsCreateResponse;
 import com.azure.storage.blob.implementation.models.AppendBlobsSealResponse;
+import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.implementation.models.StorageErrorException;
 import com.azure.storage.blob.models.BlobHttpHeaders;
@@ -92,6 +93,9 @@ Mono<AppendBlobsCreateResponse> create(
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-tags") String blobTagsString,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -208,6 +212,9 @@ Mono<AppendBlobsSealResponse> seal(
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param blobHttpHeaders Parameter group.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
@@ -232,6 +239,9 @@ public Mono<AppendBlobsCreateResponse> createWithResponseAsync(
             String ifTags,
             String requestId,
             String blobTagsString,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             BlobHttpHeaders blobHttpHeaders,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
@@ -293,6 +303,8 @@ public Mono<AppendBlobsCreateResponse> createWithResponseAsync(
                 ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.create(
                 this.client.getUrl(),
                 blobType,
@@ -320,6 +332,9 @@ public Mono<AppendBlobsCreateResponse> createWithResponseAsync(
                 this.client.getVersion(),
                 requestId,
                 blobTagsString,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImplBuilder.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImplBuilder.java
index 7b13a035a324..000608645518 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImplBuilder.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AzureBlobStorageImplBuilder.java
@@ -208,7 +208,7 @@ public AzureBlobStorageImplBuilder addPolicy(HttpPipelinePolicy customPolicy) {
      */
     public AzureBlobStorageImpl buildClient() {
         if (version == null) {
-            this.version = "2020-08-04";
+            this.version = "2020-10-02";
         }
         if (pipeline == null) {
             this.pipeline = createHttpPipeline();
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
index 20524fc11ee5..23133e3b561c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
@@ -28,6 +28,7 @@
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.storage.blob.implementation.models.BlobDeleteType;
 import com.azure.storage.blob.implementation.models.BlobExpiryOptions;
+import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.BlobTags;
 import com.azure.storage.blob.implementation.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.implementation.models.BlobsAcquireLeaseResponse;
@@ -35,6 +36,7 @@
 import com.azure.storage.blob.implementation.models.BlobsChangeLeaseResponse;
 import com.azure.storage.blob.implementation.models.BlobsCopyFromURLResponse;
 import com.azure.storage.blob.implementation.models.BlobsCreateSnapshotResponse;
+import com.azure.storage.blob.implementation.models.BlobsDeleteImmutabilityPolicyResponse;
 import com.azure.storage.blob.implementation.models.BlobsDeleteResponse;
 import com.azure.storage.blob.implementation.models.BlobsGetAccessControlResponse;
 import com.azure.storage.blob.implementation.models.BlobsGetAccountInfoResponse;
@@ -46,6 +48,8 @@
 import com.azure.storage.blob.implementation.models.BlobsSetAccessControlResponse;
 import com.azure.storage.blob.implementation.models.BlobsSetExpiryResponse;
 import com.azure.storage.blob.implementation.models.BlobsSetHttpHeadersResponse;
+import com.azure.storage.blob.implementation.models.BlobsSetImmutabilityPolicyResponse;
+import com.azure.storage.blob.implementation.models.BlobsSetLegalHoldResponse;
 import com.azure.storage.blob.implementation.models.BlobsSetMetadataResponse;
 import com.azure.storage.blob.implementation.models.BlobsSetTagsResponse;
 import com.azure.storage.blob.implementation.models.BlobsSetTierResponse;
@@ -296,6 +300,46 @@ Mono<BlobsSetHttpHeadersResponse> setHttpHeaders(
                 @HeaderParam("Accept") String accept,
                 Context context);
 
+        @Put("/{containerName}/{blob}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicy(
+                @HostParam("url") String url,
+                @QueryParam("comp") String comp,
+                @QueryParam("timeout") Integer timeout,
+                @HeaderParam("x-ms-version") String version,
+                @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("Accept") String accept,
+                Context context);
+
+        @Delete("/{containerName}/{blob}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicy(
+                @HostParam("url") String url,
+                @QueryParam("comp") String comp,
+                @QueryParam("timeout") Integer timeout,
+                @HeaderParam("x-ms-version") String version,
+                @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("Accept") String accept,
+                Context context);
+
+        @Put("/{containerName}/{blob}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        Mono<BlobsSetLegalHoldResponse> setLegalHold(
+                @HostParam("url") String url,
+                @QueryParam("comp") String comp,
+                @QueryParam("timeout") Integer timeout,
+                @HeaderParam("x-ms-version") String version,
+                @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("x-ms-legal-hold") boolean legalHold,
+                @HeaderParam("Accept") String accept,
+                Context context);
+
         @Put("/{containerName}/{blob}")
         @ExpectedResponses({200})
         @UnexpectedResponseExceptionType(com.azure.storage.blob.models.BlobStorageException.class)
@@ -482,6 +526,9 @@ Mono<BlobsStartCopyFromURLResponse> startCopyFromURL(
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-tags") String blobTagsString,
                 @HeaderParam("x-ms-seal-blob") Boolean sealBlob,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -511,6 +558,9 @@ Mono<BlobsCopyFromURLResponse> copyFromURL(
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-source-content-md5") String sourceContentMD5,
                 @HeaderParam("x-ms-tags") String blobTagsString,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -1342,6 +1392,98 @@ public Mono<BlobsSetHttpHeadersResponse> setHttpHeadersWithResponseAsync(
                 context);
     }
 
+    /**
+     * The Set Immutability Policy operation sets the immutability policy on the blob.
+     *
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
+     *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
+     *     Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
+     *     analytics logs when storage analytics logging is enabled.
+     * @param ifUnmodifiedSince Specify this header value to operate only on a blob if it has not been modified since
+     *     the specified date/time.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws StorageErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the completion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicyWithResponseAsync(
+            Integer timeout,
+            String requestId,
+            OffsetDateTime ifUnmodifiedSince,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Context context) {
+        final String comp = "immutabilityPolicies";
+        final String accept = "application/xml";
+        DateTimeRfc1123 ifUnmodifiedSinceConverted =
+                ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
+        return service.setImmutabilityPolicy(
+                this.client.getUrl(),
+                comp,
+                timeout,
+                this.client.getVersion(),
+                requestId,
+                ifUnmodifiedSinceConverted,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                accept,
+                context);
+    }
+
+    /**
+     * The Delete Immutability Policy operation deletes the immutability policy on the blob.
+     *
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
+     *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
+     *     Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
+     *     analytics logs when storage analytics logging is enabled.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws StorageErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the completion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicyWithResponseAsync(
+            Integer timeout, String requestId, Context context) {
+        final String comp = "immutabilityPolicies";
+        final String accept = "application/xml";
+        return service.deleteImmutabilityPolicy(
+                this.client.getUrl(), comp, timeout, this.client.getVersion(), requestId, accept, context);
+    }
+
+    /**
+     * The Set Legal Hold operation sets a legal hold on the blob.
+     *
+     * @param legalHold Specified if a legal hold should be set on the blob.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
+     *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
+     *     Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
+     *     analytics logs when storage analytics logging is enabled.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws StorageErrorException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the completion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<BlobsSetLegalHoldResponse> setLegalHoldWithResponseAsync(
+            boolean legalHold, Integer timeout, String requestId, Context context) {
+        final String comp = "legalhold";
+        final String accept = "application/xml";
+        return service.setLegalHold(
+                this.client.getUrl(), comp, timeout, this.client.getVersion(), requestId, legalHold, accept, context);
+    }
+
     /**
      * The Set Blob Metadata operation sets user-defined metadata for the specified blob as one or more name-value
      * pairs.
@@ -1907,6 +2049,9 @@ public Mono<BlobsCreateSnapshotResponse> createSnapshotWithResponseAsync(
      *     analytics logs when storage analytics logging is enabled.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
      * @param sealBlob Overrides the sealed state of the destination blob. Service version 2019-12-12 and newer.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws StorageErrorException thrown if the request is rejected by server.
@@ -1936,6 +2081,9 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithResponseAsync(
             String requestId,
             String blobTagsString,
             Boolean sealBlob,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             Context context) {
         final String accept = "application/xml";
         DateTimeRfc1123 sourceIfModifiedSinceConverted =
@@ -1946,6 +2094,8 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithResponseAsync(
                 ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.startCopyFromURL(
                 this.client.getUrl(),
                 containerName,
@@ -1970,6 +2120,9 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithResponseAsync(
                 requestId,
                 blobTagsString,
                 sealBlob,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 accept,
                 context);
     }
@@ -2011,6 +2164,9 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithResponseAsync(
      *     analytics logs when storage analytics logging is enabled.
      * @param sourceContentMD5 Specify the md5 calculated for the range of bytes that must be read from the copy source.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws StorageErrorException thrown if the request is rejected by server.
@@ -2038,6 +2194,9 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithResponseAsync(
             String requestId,
             byte[] sourceContentMD5,
             String blobTagsString,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             Context context) {
         final String xMsRequiresSync = "true";
         final String accept = "application/xml";
@@ -2050,6 +2209,8 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithResponseAsync(
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
         String sourceContentMD5Converted = Base64Util.encodeToString(sourceContentMD5);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.copyFromURL(
                 this.client.getUrl(),
                 xMsRequiresSync,
@@ -2073,6 +2234,9 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithResponseAsync(
                 requestId,
                 sourceContentMD5Converted,
                 blobTagsString,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
index 0b5b653819f3..9770b1489f9f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.implementation.models.BlockBlobsGetBlockListResponse;
 import com.azure.storage.blob.implementation.models.BlockBlobsPutBlobFromUrlResponse;
@@ -100,6 +101,9 @@ Mono<BlockBlobsUploadResponse> upload(
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-tags") String blobTagsString,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @BodyParam("application/octet-stream") Flux<ByteBuffer> body,
                 @HeaderParam("Accept") String accept,
                 Context context);
@@ -232,6 +236,9 @@ Mono<BlockBlobsCommitBlockListResponse> commitBlockList(
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-tags") String blobTagsString,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @BodyParam("application/xml") BlockLookupList blocks,
                 @HeaderParam("Accept") String accept,
                 Context context);
@@ -287,6 +294,9 @@ Mono<BlockBlobsGetBlockListResponse> getBlockList(
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param blobHttpHeaders Parameter group.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
@@ -314,6 +324,9 @@ public Mono<BlockBlobsUploadResponse> uploadWithResponseAsync(
             String ifTags,
             String requestId,
             String blobTagsString,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             BlobHttpHeaders blobHttpHeaders,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
@@ -376,6 +389,8 @@ public Mono<BlockBlobsUploadResponse> uploadWithResponseAsync(
                 ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.upload(
                 this.client.getUrl(),
                 blobType,
@@ -405,6 +420,9 @@ public Mono<BlockBlobsUploadResponse> uploadWithResponseAsync(
                 this.client.getVersion(),
                 requestId,
                 blobTagsString,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 body,
                 accept,
                 context);
@@ -828,6 +846,9 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithResponseAs
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param blobHttpHeaders Parameter group.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
@@ -855,6 +876,9 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithResponseAsync(
             String ifTags,
             String requestId,
             String blobTagsString,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             BlobHttpHeaders blobHttpHeaders,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
@@ -918,6 +942,8 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithResponseAsync(
                 ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.commitBlockList(
                 this.client.getUrl(),
                 comp,
@@ -947,6 +973,9 @@ public Mono<BlockBlobsCommitBlockListResponse> commitBlockListWithResponseAsync(
                 this.client.getVersion(),
                 requestId,
                 blobTagsString,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 blocks,
                 accept,
                 context);
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
index f59aaa7d6ef9..88dd509959c1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.implementation.models.PageBlobsClearPagesResponse;
 import com.azure.storage.blob.implementation.models.PageBlobsCopyIncrementalResponse;
@@ -103,6 +104,9 @@ Mono<PageBlobsCreateResponse> create(
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
                 @HeaderParam("x-ms-tags") String blobTagsString,
+                @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
+                @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
+                @HeaderParam("x-ms-legal-hold") Boolean legalHold,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -352,6 +356,9 @@ Mono<PageBlobsCopyIncrementalResponse> copyIncremental(
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
+     * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
+     * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
+     * @param legalHold Specified if a legal hold should be set on the blob.
      * @param blobHttpHeaders Parameter group.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
@@ -379,6 +386,9 @@ public Mono<PageBlobsCreateResponse> createWithResponseAsync(
             Long blobSequenceNumber,
             String requestId,
             String blobTagsString,
+            OffsetDateTime immutabilityPolicyExpiry,
+            BlobImmutabilityPolicyMode immutabilityPolicyMode,
+            Boolean legalHold,
             BlobHttpHeaders blobHttpHeaders,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
@@ -440,6 +450,8 @@ public Mono<PageBlobsCreateResponse> createWithResponseAsync(
                 ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted =
                 ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
+        DateTimeRfc1123 immutabilityPolicyExpiryConverted =
+                immutabilityPolicyExpiry == null ? null : new DateTimeRfc1123(immutabilityPolicyExpiry);
         return service.create(
                 this.client.getUrl(),
                 blobType,
@@ -470,6 +482,9 @@ public Mono<PageBlobsCreateResponse> createWithResponseAsync(
                 this.client.getVersion(),
                 requestId,
                 blobTagsString,
+                immutabilityPolicyExpiryConverted,
+                immutabilityPolicyMode,
+                legalHold,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java
new file mode 100644
index 000000000000..4c483833f7ac
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/** Defines values for BlobImmutabilityPolicyMode. */
+public enum BlobImmutabilityPolicyMode {
+    /** Enum value Unlocked. */
+    UNLOCKED("Unlocked"),
+
+    /** Enum value Locked. */
+    LOCKED("Locked"),
+
+    /** Enum value Mutable. */
+    MUTABLE("Mutable");
+
+    /** The actual serialized value for a BlobImmutabilityPolicyMode instance. */
+    private final String value;
+
+    BlobImmutabilityPolicyMode(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a BlobImmutabilityPolicyMode instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed BlobImmutabilityPolicyMode object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static BlobImmutabilityPolicyMode fromString(String value) {
+        BlobImmutabilityPolicyMode[] items = BlobImmutabilityPolicyMode.values();
+        for (BlobImmutabilityPolicyMode item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
index 25f3ddd92417..446e4a682d1a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
@@ -246,6 +246,24 @@ public final class BlobItemPropertiesInternal {
     @JsonProperty(value = "LastAccessTime")
     private DateTimeRfc1123 lastAccessedOn;
 
+    /*
+     * The ImmutabilityPolicyUntilDate property.
+     */
+    @JsonProperty(value = "ImmutabilityPolicyUntilDate")
+    private DateTimeRfc1123 immutabilityPolicyExpiresOn;
+
+    /*
+     * The ImmutabilityPolicyMode property.
+     */
+    @JsonProperty(value = "ImmutabilityPolicyMode")
+    private BlobImmutabilityPolicyMode immutabilityPolicyMode;
+
+    /*
+     * The LegalHold property.
+     */
+    @JsonProperty(value = "LegalHold")
+    private Boolean legalHold;
+
     /**
      * Get the creationTime property: The Creation-Time property.
      *
@@ -1036,4 +1054,71 @@ public BlobItemPropertiesInternal setLastAccessedOn(OffsetDateTime lastAccessedO
         }
         return this;
     }
+
+    /**
+     * Get the immutabilityPolicyExpiresOn property: The ImmutabilityPolicyUntilDate property.
+     *
+     * @return the immutabilityPolicyExpiresOn value.
+     */
+    public OffsetDateTime getImmutabilityPolicyExpiresOn() {
+        if (this.immutabilityPolicyExpiresOn == null) {
+            return null;
+        }
+        return this.immutabilityPolicyExpiresOn.getDateTime();
+    }
+
+    /**
+     * Set the immutabilityPolicyExpiresOn property: The ImmutabilityPolicyUntilDate property.
+     *
+     * @param immutabilityPolicyExpiresOn the immutabilityPolicyExpiresOn value to set.
+     * @return the BlobItemPropertiesInternal object itself.
+     */
+    public BlobItemPropertiesInternal setImmutabilityPolicyExpiresOn(OffsetDateTime immutabilityPolicyExpiresOn) {
+        if (immutabilityPolicyExpiresOn == null) {
+            this.immutabilityPolicyExpiresOn = null;
+        } else {
+            this.immutabilityPolicyExpiresOn = new DateTimeRfc1123(immutabilityPolicyExpiresOn);
+        }
+        return this;
+    }
+
+    /**
+     * Get the immutabilityPolicyMode property: The ImmutabilityPolicyMode property.
+     *
+     * @return the immutabilityPolicyMode value.
+     */
+    public BlobImmutabilityPolicyMode getImmutabilityPolicyMode() {
+        return this.immutabilityPolicyMode;
+    }
+
+    /**
+     * Set the immutabilityPolicyMode property: The ImmutabilityPolicyMode property.
+     *
+     * @param immutabilityPolicyMode the immutabilityPolicyMode value to set.
+     * @return the BlobItemPropertiesInternal object itself.
+     */
+    public BlobItemPropertiesInternal setImmutabilityPolicyMode(BlobImmutabilityPolicyMode immutabilityPolicyMode) {
+        this.immutabilityPolicyMode = immutabilityPolicyMode;
+        return this;
+    }
+
+    /**
+     * Get the legalHold property: The LegalHold property.
+     *
+     * @return the legalHold value.
+     */
+    public Boolean isLegalHold() {
+        return this.legalHold;
+    }
+
+    /**
+     * Set the legalHold property: The LegalHold property.
+     *
+     * @param legalHold the legalHold value to set.
+     * @return the BlobItemPropertiesInternal object itself.
+     */
+    public BlobItemPropertiesInternal setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyHeaders.java
new file mode 100644
index 000000000000..260bde889bbe
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyHeaders.java
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.DateTimeRfc1123;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/** The BlobsDeleteImmutabilityPolicyHeaders model. */
+@JacksonXmlRootElement(localName = "null")
+@Fluent
+public final class BlobsDeleteImmutabilityPolicyHeaders {
+    /*
+     * The x-ms-version property.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String xMsVersion;
+
+    /*
+     * The x-ms-request-id property.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /*
+     * The x-ms-client-request-id property.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String xMsClientRequestId;
+
+    /*
+     * The Date property.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the xMsVersion property: The x-ms-version property.
+     *
+     * @return the xMsVersion value.
+     */
+    public String getXMsVersion() {
+        return this.xMsVersion;
+    }
+
+    /**
+     * Set the xMsVersion property: The x-ms-version property.
+     *
+     * @param xMsVersion the xMsVersion value to set.
+     * @return the BlobsDeleteImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsDeleteImmutabilityPolicyHeaders setXMsVersion(String xMsVersion) {
+        this.xMsVersion = xMsVersion;
+        return this;
+    }
+
+    /**
+     * Get the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @return the xMsRequestId value.
+     */
+    public String getXMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @param xMsRequestId the xMsRequestId value to set.
+     * @return the BlobsDeleteImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsDeleteImmutabilityPolicyHeaders setXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @return the xMsClientRequestId value.
+     */
+    public String getXMsClientRequestId() {
+        return this.xMsClientRequestId;
+    }
+
+    /**
+     * Set the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @param xMsClientRequestId the xMsClientRequestId value to set.
+     * @return the BlobsDeleteImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsDeleteImmutabilityPolicyHeaders setXMsClientRequestId(String xMsClientRequestId) {
+        this.xMsClientRequestId = xMsClientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: The Date property.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime getDateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.getDateTime();
+    }
+
+    /**
+     * Set the dateProperty property: The Date property.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobsDeleteImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsDeleteImmutabilityPolicyHeaders setDateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyResponse.java
new file mode 100644
index 000000000000..2da244a7869d
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDeleteImmutabilityPolicyResponse.java
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/** Contains all response data for the deleteImmutabilityPolicy operation. */
+public final class BlobsDeleteImmutabilityPolicyResponse
+        extends ResponseBase<BlobsDeleteImmutabilityPolicyHeaders, Void> {
+    /**
+     * Creates an instance of BlobsDeleteImmutabilityPolicyResponse.
+     *
+     * @param request the request which resulted in this BlobsDeleteImmutabilityPolicyResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsDeleteImmutabilityPolicyResponse(
+            HttpRequest request,
+            int statusCode,
+            HttpHeaders rawHeaders,
+            Void value,
+            BlobsDeleteImmutabilityPolicyHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDownloadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDownloadHeaders.java
index 7babca01ac0b..980336772d05 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDownloadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDownloadHeaders.java
@@ -82,6 +82,12 @@ public final class BlobsDownloadHeaders {
     @JsonProperty(value = "x-ms-blob-type")
     private BlobType xMsBlobType;
 
+    /*
+     * The x-ms-immutability-policy-mode property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-mode")
+    private String xMsImmutabilityPolicyMode;
+
     /*
      * The Content-Encoding property.
      */
@@ -142,6 +148,12 @@ public final class BlobsDownloadHeaders {
     @JsonProperty(value = "x-ms-copy-source")
     private String xMsCopySource;
 
+    /*
+     * The x-ms-immutability-policy-until-date property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-until-date")
+    private DateTimeRfc1123 xMsImmutabilityPolicyUntilDate;
+
     /*
      * The x-ms-content-crc64 property.
      */
@@ -178,6 +190,12 @@ public final class BlobsDownloadHeaders {
     @HeaderCollection("x-ms-meta-")
     private Map<String, String> xMsMeta;
 
+    /*
+     * The x-ms-legal-hold property.
+     */
+    @JsonProperty(value = "x-ms-legal-hold")
+    private Boolean xMsLegalHold;
+
     /*
      * The Date property.
      */
@@ -469,6 +487,26 @@ public BlobsDownloadHeaders setXMsBlobType(BlobType xMsBlobType) {
         return this;
     }
 
+    /**
+     * Get the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
+     *
+     * @return the xMsImmutabilityPolicyMode value.
+     */
+    public String getXMsImmutabilityPolicyMode() {
+        return this.xMsImmutabilityPolicyMode;
+    }
+
+    /**
+     * Set the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
+     *
+     * @param xMsImmutabilityPolicyMode the xMsImmutabilityPolicyMode value to set.
+     * @return the BlobsDownloadHeaders object itself.
+     */
+    public BlobsDownloadHeaders setXMsImmutabilityPolicyMode(String xMsImmutabilityPolicyMode) {
+        this.xMsImmutabilityPolicyMode = xMsImmutabilityPolicyMode;
+        return this;
+    }
+
     /**
      * Get the contentEncoding property: The Content-Encoding property.
      *
@@ -676,6 +714,33 @@ public BlobsDownloadHeaders setXMsCopySource(String xMsCopySource) {
         return this;
     }
 
+    /**
+     * Get the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
+     *
+     * @return the xMsImmutabilityPolicyUntilDate value.
+     */
+    public OffsetDateTime getXMsImmutabilityPolicyUntilDate() {
+        if (this.xMsImmutabilityPolicyUntilDate == null) {
+            return null;
+        }
+        return this.xMsImmutabilityPolicyUntilDate.getDateTime();
+    }
+
+    /**
+     * Set the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
+     *
+     * @param xMsImmutabilityPolicyUntilDate the xMsImmutabilityPolicyUntilDate value to set.
+     * @return the BlobsDownloadHeaders object itself.
+     */
+    public BlobsDownloadHeaders setXMsImmutabilityPolicyUntilDate(OffsetDateTime xMsImmutabilityPolicyUntilDate) {
+        if (xMsImmutabilityPolicyUntilDate == null) {
+            this.xMsImmutabilityPolicyUntilDate = null;
+        } else {
+            this.xMsImmutabilityPolicyUntilDate = new DateTimeRfc1123(xMsImmutabilityPolicyUntilDate);
+        }
+        return this;
+    }
+
     /**
      * Get the xMsContentCrc64 property: The x-ms-content-crc64 property.
      *
@@ -796,6 +861,26 @@ public BlobsDownloadHeaders setXMsMeta(Map<String, String> xMsMeta) {
         return this;
     }
 
+    /**
+     * Get the xMsLegalHold property: The x-ms-legal-hold property.
+     *
+     * @return the xMsLegalHold value.
+     */
+    public Boolean isXMsLegalHold() {
+        return this.xMsLegalHold;
+    }
+
+    /**
+     * Set the xMsLegalHold property: The x-ms-legal-hold property.
+     *
+     * @param xMsLegalHold the xMsLegalHold value to set.
+     * @return the BlobsDownloadHeaders object itself.
+     */
+    public BlobsDownloadHeaders setXMsLegalHold(Boolean xMsLegalHold) {
+        this.xMsLegalHold = xMsLegalHold;
+        return this;
+    }
+
     /**
      * Get the dateProperty property: The Date property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
index 687ae2ab7b38..671d3c8a9e5a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
@@ -34,12 +34,6 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-lease-status")
     private LeaseStatusType xMsLeaseStatus;
 
-    /*
-     * The x-ms-tag-count property.
-     */
-    @JsonProperty(value = "x-ms-tag-count")
-    private Long xMsTagCount;
-
     /*
      * The x-ms-copy-destination-snapshot property.
      */
@@ -58,12 +52,6 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-sealed")
     private Boolean xMsBlobSealed;
 
-    /*
-     * The Last-Modified property.
-     */
-    @JsonProperty(value = "Last-Modified")
-    private DateTimeRfc1123 lastModified;
-
     /*
      * The x-ms-version-id property.
      */
@@ -88,30 +76,12 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-blob-type")
     private BlobType xMsBlobType;
 
-    /*
-     * The x-ms-access-tier-inferred property.
-     */
-    @JsonProperty(value = "x-ms-access-tier-inferred")
-    private Boolean xMsAccessTierInferred;
-
-    /*
-     * The x-ms-access-tier property.
-     */
-    @JsonProperty(value = "x-ms-access-tier")
-    private String xMsAccessTier;
-
     /*
      * The Content-Encoding property.
      */
     @JsonProperty(value = "Content-Encoding")
     private String contentEncoding;
 
-    /*
-     * The x-ms-copy-status-description property.
-     */
-    @JsonProperty(value = "x-ms-copy-status-description")
-    private String xMsCopyStatusDescription;
-
     /*
      * The x-ms-creation-time property.
      */
@@ -130,6 +100,132 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-lease-duration")
     private LeaseDurationType xMsLeaseDuration;
 
+    /*
+     * The x-ms-version property.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String xMsVersion;
+
+    /*
+     * The x-ms-copy-id property.
+     */
+    @JsonProperty(value = "x-ms-copy-id")
+    private String xMsCopyId;
+
+    /*
+     * The x-ms-immutability-policy-until-date property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-until-date")
+    private DateTimeRfc1123 xMsImmutabilityPolicyUntilDate;
+
+    /*
+     * The x-ms-blob-sequence-number property.
+     */
+    @JsonProperty(value = "x-ms-blob-sequence-number")
+    private Long xMsBlobSequenceNumber;
+
+    /*
+     * The x-ms-blob-committed-block-count property.
+     */
+    @JsonProperty(value = "x-ms-blob-committed-block-count")
+    private Integer xMsBlobCommittedBlockCount;
+
+    /*
+     * The x-ms-legal-hold property.
+     */
+    @JsonProperty(value = "x-ms-legal-hold")
+    private Boolean xMsLegalHold;
+
+    /*
+     * The Content-MD5 property.
+     */
+    @JsonProperty(value = "Content-MD5")
+    private byte[] contentMD5;
+
+    /*
+     * The x-ms-or-policy-id property.
+     */
+    @JsonProperty(value = "x-ms-or-policy-id")
+    private String xMsOrPolicyId;
+
+    /*
+     * The Cache-Control property.
+     */
+    @JsonProperty(value = "Cache-Control")
+    private String cacheControl;
+
+    /*
+     * The ETag property.
+     */
+    @JsonProperty(value = "ETag")
+    private String eTag;
+
+    /*
+     * The Content-Disposition property.
+     */
+    @JsonProperty(value = "Content-Disposition")
+    private String contentDisposition;
+
+    /*
+     * The Content-Language property.
+     */
+    @JsonProperty(value = "Content-Language")
+    private String contentLanguage;
+
+    /*
+     * The x-ms-client-request-id property.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String xMsClientRequestId;
+
+    /*
+     * The x-ms-or- property.
+     */
+    @HeaderCollection("x-ms-or-")
+    private Map<String, String> xMsOr;
+
+    /*
+     * The x-ms-encryption-scope property.
+     */
+    @JsonProperty(value = "x-ms-encryption-scope")
+    private String xMsEncryptionScope;
+
+    /*
+     * The x-ms-tag-count property.
+     */
+    @JsonProperty(value = "x-ms-tag-count")
+    private Long xMsTagCount;
+
+    /*
+     * The Last-Modified property.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * The x-ms-access-tier-inferred property.
+     */
+    @JsonProperty(value = "x-ms-access-tier-inferred")
+    private Boolean xMsAccessTierInferred;
+
+    /*
+     * The x-ms-immutability-policy-mode property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-mode")
+    private BlobImmutabilityPolicyMode xMsImmutabilityPolicyMode;
+
+    /*
+     * The x-ms-access-tier property.
+     */
+    @JsonProperty(value = "x-ms-access-tier")
+    private String xMsAccessTier;
+
+    /*
+     * The x-ms-copy-status-description property.
+     */
+    @JsonProperty(value = "x-ms-copy-status-description")
+    private String xMsCopyStatusDescription;
+
     /*
      * The Content-Length property.
      */
@@ -154,42 +250,18 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-last-access-time")
     private DateTimeRfc1123 xMsLastAccessTime;
 
-    /*
-     * The x-ms-version property.
-     */
-    @JsonProperty(value = "x-ms-version")
-    private String xMsVersion;
-
-    /*
-     * The x-ms-copy-id property.
-     */
-    @JsonProperty(value = "x-ms-copy-id")
-    private String xMsCopyId;
-
     /*
      * The x-ms-copy-source property.
      */
     @JsonProperty(value = "x-ms-copy-source")
     private String xMsCopySource;
 
-    /*
-     * The x-ms-blob-sequence-number property.
-     */
-    @JsonProperty(value = "x-ms-blob-sequence-number")
-    private Long xMsBlobSequenceNumber;
-
     /*
      * The x-ms-copy-progress property.
      */
     @JsonProperty(value = "x-ms-copy-progress")
     private String xMsCopyProgress;
 
-    /*
-     * The x-ms-blob-committed-block-count property.
-     */
-    @JsonProperty(value = "x-ms-blob-committed-block-count")
-    private Integer xMsBlobCommittedBlockCount;
-
     /*
      * The x-ms-meta- property.
      */
@@ -208,12 +280,6 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-expiry-time")
     private DateTimeRfc1123 xMsExpiryTime;
 
-    /*
-     * The Content-MD5 property.
-     */
-    @JsonProperty(value = "Content-MD5")
-    private byte[] contentMD5;
-
     /*
      * The x-ms-copy-completion-time property.
      */
@@ -232,36 +298,12 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-server-encrypted")
     private Boolean xMsServerEncrypted;
 
-    /*
-     * The x-ms-or-policy-id property.
-     */
-    @JsonProperty(value = "x-ms-or-policy-id")
-    private String xMsOrPolicyId;
-
     /*
      * The x-ms-rehydrate-priority property.
      */
     @JsonProperty(value = "x-ms-rehydrate-priority")
     private String xMsRehydratePriority;
 
-    /*
-     * The Cache-Control property.
-     */
-    @JsonProperty(value = "Cache-Control")
-    private String cacheControl;
-
-    /*
-     * The ETag property.
-     */
-    @JsonProperty(value = "ETag")
-    private String eTag;
-
-    /*
-     * The Content-Disposition property.
-     */
-    @JsonProperty(value = "Content-Disposition")
-    private String contentDisposition;
-
     /*
      * The x-ms-copy-status property.
      */
@@ -274,30 +316,6 @@ public final class BlobsGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-archive-status")
     private String xMsArchiveStatus;
 
-    /*
-     * The Content-Language property.
-     */
-    @JsonProperty(value = "Content-Language")
-    private String contentLanguage;
-
-    /*
-     * The x-ms-client-request-id property.
-     */
-    @JsonProperty(value = "x-ms-client-request-id")
-    private String xMsClientRequestId;
-
-    /*
-     * The x-ms-or- property.
-     */
-    @HeaderCollection("x-ms-or-")
-    private Map<String, String> xMsOr;
-
-    /*
-     * The x-ms-encryption-scope property.
-     */
-    @JsonProperty(value = "x-ms-encryption-scope")
-    private String xMsEncryptionScope;
-
     /**
      * Get the xMsIsCurrentVersion property: The x-ms-is-current-version property.
      *
@@ -338,26 +356,6 @@ public BlobsGetPropertiesHeaders setXMsLeaseStatus(LeaseStatusType xMsLeaseStatu
         return this;
     }
 
-    /**
-     * Get the xMsTagCount property: The x-ms-tag-count property.
-     *
-     * @return the xMsTagCount value.
-     */
-    public Long getXMsTagCount() {
-        return this.xMsTagCount;
-    }
-
-    /**
-     * Set the xMsTagCount property: The x-ms-tag-count property.
-     *
-     * @param xMsTagCount the xMsTagCount value to set.
-     * @return the BlobsGetPropertiesHeaders object itself.
-     */
-    public BlobsGetPropertiesHeaders setXMsTagCount(Long xMsTagCount) {
-        this.xMsTagCount = xMsTagCount;
-        return this;
-    }
-
     /**
      * Get the xMsCopyDestinationSnapshot property: The x-ms-copy-destination-snapshot property.
      *
@@ -419,39 +417,12 @@ public BlobsGetPropertiesHeaders setXMsBlobSealed(Boolean xMsBlobSealed) {
     }
 
     /**
-     * Get the lastModified property: The Last-Modified property.
+     * Get the xMsVersionId property: The x-ms-version-id property.
      *
-     * @return the lastModified value.
+     * @return the xMsVersionId value.
      */
-    public OffsetDateTime getLastModified() {
-        if (this.lastModified == null) {
-            return null;
-        }
-        return this.lastModified.getDateTime();
-    }
-
-    /**
-     * Set the lastModified property: The Last-Modified property.
-     *
-     * @param lastModified the lastModified value to set.
-     * @return the BlobsGetPropertiesHeaders object itself.
-     */
-    public BlobsGetPropertiesHeaders setLastModified(OffsetDateTime lastModified) {
-        if (lastModified == null) {
-            this.lastModified = null;
-        } else {
-            this.lastModified = new DateTimeRfc1123(lastModified);
-        }
-        return this;
-    }
-
-    /**
-     * Get the xMsVersionId property: The x-ms-version-id property.
-     *
-     * @return the xMsVersionId value.
-     */
-    public String getXMsVersionId() {
-        return this.xMsVersionId;
+    public String getXMsVersionId() {
+        return this.xMsVersionId;
     }
 
     /**
@@ -532,46 +503,6 @@ public BlobsGetPropertiesHeaders setXMsBlobType(BlobType xMsBlobType) {
         return this;
     }
 
-    /**
-     * Get the xMsAccessTierInferred property: The x-ms-access-tier-inferred property.
-     *
-     * @return the xMsAccessTierInferred value.
-     */
-    public Boolean isXMsAccessTierInferred() {
-        return this.xMsAccessTierInferred;
-    }
-
-    /**
-     * Set the xMsAccessTierInferred property: The x-ms-access-tier-inferred property.
-     *
-     * @param xMsAccessTierInferred the xMsAccessTierInferred value to set.
-     * @return the BlobsGetPropertiesHeaders object itself.
-     */
-    public BlobsGetPropertiesHeaders setXMsAccessTierInferred(Boolean xMsAccessTierInferred) {
-        this.xMsAccessTierInferred = xMsAccessTierInferred;
-        return this;
-    }
-
-    /**
-     * Get the xMsAccessTier property: The x-ms-access-tier property.
-     *
-     * @return the xMsAccessTier value.
-     */
-    public String getXMsAccessTier() {
-        return this.xMsAccessTier;
-    }
-
-    /**
-     * Set the xMsAccessTier property: The x-ms-access-tier property.
-     *
-     * @param xMsAccessTier the xMsAccessTier value to set.
-     * @return the BlobsGetPropertiesHeaders object itself.
-     */
-    public BlobsGetPropertiesHeaders setXMsAccessTier(String xMsAccessTier) {
-        this.xMsAccessTier = xMsAccessTier;
-        return this;
-    }
-
     /**
      * Get the contentEncoding property: The Content-Encoding property.
      *
@@ -592,26 +523,6 @@ public BlobsGetPropertiesHeaders setContentEncoding(String contentEncoding) {
         return this;
     }
 
-    /**
-     * Get the xMsCopyStatusDescription property: The x-ms-copy-status-description property.
-     *
-     * @return the xMsCopyStatusDescription value.
-     */
-    public String getXMsCopyStatusDescription() {
-        return this.xMsCopyStatusDescription;
-    }
-
-    /**
-     * Set the xMsCopyStatusDescription property: The x-ms-copy-status-description property.
-     *
-     * @param xMsCopyStatusDescription the xMsCopyStatusDescription value to set.
-     * @return the BlobsGetPropertiesHeaders object itself.
-     */
-    public BlobsGetPropertiesHeaders setXMsCopyStatusDescription(String xMsCopyStatusDescription) {
-        this.xMsCopyStatusDescription = xMsCopyStatusDescription;
-        return this;
-    }
-
     /**
      * Get the xMsCreationTime property: The x-ms-creation-time property.
      *
@@ -680,590 +591,765 @@ public BlobsGetPropertiesHeaders setXMsLeaseDuration(LeaseDurationType xMsLeaseD
     }
 
     /**
-     * Get the contentLength property: The Content-Length property.
+     * Get the xMsVersion property: The x-ms-version property.
      *
-     * @return the contentLength value.
+     * @return the xMsVersion value.
      */
-    public Long getContentLength() {
-        return this.contentLength;
+    public String getXMsVersion() {
+        return this.xMsVersion;
     }
 
     /**
-     * Set the contentLength property: The Content-Length property.
+     * Set the xMsVersion property: The x-ms-version property.
      *
-     * @param contentLength the contentLength value to set.
+     * @param xMsVersion the xMsVersion value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setContentLength(Long contentLength) {
-        this.contentLength = contentLength;
+    public BlobsGetPropertiesHeaders setXMsVersion(String xMsVersion) {
+        this.xMsVersion = xMsVersion;
         return this;
     }
 
     /**
-     * Get the xMsRequestId property: The x-ms-request-id property.
+     * Get the xMsCopyId property: The x-ms-copy-id property.
      *
-     * @return the xMsRequestId value.
+     * @return the xMsCopyId value.
      */
-    public String getXMsRequestId() {
-        return this.xMsRequestId;
+    public String getXMsCopyId() {
+        return this.xMsCopyId;
     }
 
     /**
-     * Set the xMsRequestId property: The x-ms-request-id property.
+     * Set the xMsCopyId property: The x-ms-copy-id property.
      *
-     * @param xMsRequestId the xMsRequestId value to set.
+     * @param xMsCopyId the xMsCopyId value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsRequestId(String xMsRequestId) {
-        this.xMsRequestId = xMsRequestId;
+    public BlobsGetPropertiesHeaders setXMsCopyId(String xMsCopyId) {
+        this.xMsCopyId = xMsCopyId;
         return this;
     }
 
     /**
-     * Get the contentType property: The Content-Type property.
+     * Get the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
      *
-     * @return the contentType value.
+     * @return the xMsImmutabilityPolicyUntilDate value.
      */
-    public String getContentType() {
-        return this.contentType;
+    public OffsetDateTime getXMsImmutabilityPolicyUntilDate() {
+        if (this.xMsImmutabilityPolicyUntilDate == null) {
+            return null;
+        }
+        return this.xMsImmutabilityPolicyUntilDate.getDateTime();
     }
 
     /**
-     * Set the contentType property: The Content-Type property.
+     * Set the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
      *
-     * @param contentType the contentType value to set.
+     * @param xMsImmutabilityPolicyUntilDate the xMsImmutabilityPolicyUntilDate value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setContentType(String contentType) {
-        this.contentType = contentType;
+    public BlobsGetPropertiesHeaders setXMsImmutabilityPolicyUntilDate(OffsetDateTime xMsImmutabilityPolicyUntilDate) {
+        if (xMsImmutabilityPolicyUntilDate == null) {
+            this.xMsImmutabilityPolicyUntilDate = null;
+        } else {
+            this.xMsImmutabilityPolicyUntilDate = new DateTimeRfc1123(xMsImmutabilityPolicyUntilDate);
+        }
         return this;
     }
 
     /**
-     * Get the xMsLastAccessTime property: The x-ms-last-access-time property.
+     * Get the xMsBlobSequenceNumber property: The x-ms-blob-sequence-number property.
      *
-     * @return the xMsLastAccessTime value.
+     * @return the xMsBlobSequenceNumber value.
      */
-    public OffsetDateTime getXMsLastAccessTime() {
-        if (this.xMsLastAccessTime == null) {
-            return null;
-        }
-        return this.xMsLastAccessTime.getDateTime();
+    public Long getXMsBlobSequenceNumber() {
+        return this.xMsBlobSequenceNumber;
     }
 
     /**
-     * Set the xMsLastAccessTime property: The x-ms-last-access-time property.
+     * Set the xMsBlobSequenceNumber property: The x-ms-blob-sequence-number property.
      *
-     * @param xMsLastAccessTime the xMsLastAccessTime value to set.
+     * @param xMsBlobSequenceNumber the xMsBlobSequenceNumber value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsLastAccessTime(OffsetDateTime xMsLastAccessTime) {
-        if (xMsLastAccessTime == null) {
-            this.xMsLastAccessTime = null;
-        } else {
-            this.xMsLastAccessTime = new DateTimeRfc1123(xMsLastAccessTime);
-        }
+    public BlobsGetPropertiesHeaders setXMsBlobSequenceNumber(Long xMsBlobSequenceNumber) {
+        this.xMsBlobSequenceNumber = xMsBlobSequenceNumber;
         return this;
     }
 
     /**
-     * Get the xMsVersion property: The x-ms-version property.
+     * Get the xMsBlobCommittedBlockCount property: The x-ms-blob-committed-block-count property.
      *
-     * @return the xMsVersion value.
+     * @return the xMsBlobCommittedBlockCount value.
      */
-    public String getXMsVersion() {
-        return this.xMsVersion;
+    public Integer getXMsBlobCommittedBlockCount() {
+        return this.xMsBlobCommittedBlockCount;
     }
 
     /**
-     * Set the xMsVersion property: The x-ms-version property.
+     * Set the xMsBlobCommittedBlockCount property: The x-ms-blob-committed-block-count property.
      *
-     * @param xMsVersion the xMsVersion value to set.
+     * @param xMsBlobCommittedBlockCount the xMsBlobCommittedBlockCount value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsVersion(String xMsVersion) {
-        this.xMsVersion = xMsVersion;
+    public BlobsGetPropertiesHeaders setXMsBlobCommittedBlockCount(Integer xMsBlobCommittedBlockCount) {
+        this.xMsBlobCommittedBlockCount = xMsBlobCommittedBlockCount;
         return this;
     }
 
     /**
-     * Get the xMsCopyId property: The x-ms-copy-id property.
+     * Get the xMsLegalHold property: The x-ms-legal-hold property.
      *
-     * @return the xMsCopyId value.
+     * @return the xMsLegalHold value.
      */
-    public String getXMsCopyId() {
-        return this.xMsCopyId;
+    public Boolean isXMsLegalHold() {
+        return this.xMsLegalHold;
     }
 
     /**
-     * Set the xMsCopyId property: The x-ms-copy-id property.
+     * Set the xMsLegalHold property: The x-ms-legal-hold property.
      *
-     * @param xMsCopyId the xMsCopyId value to set.
+     * @param xMsLegalHold the xMsLegalHold value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsCopyId(String xMsCopyId) {
-        this.xMsCopyId = xMsCopyId;
+    public BlobsGetPropertiesHeaders setXMsLegalHold(Boolean xMsLegalHold) {
+        this.xMsLegalHold = xMsLegalHold;
         return this;
     }
 
     /**
-     * Get the xMsCopySource property: The x-ms-copy-source property.
+     * Get the contentMD5 property: The Content-MD5 property.
      *
-     * @return the xMsCopySource value.
+     * @return the contentMD5 value.
      */
-    public String getXMsCopySource() {
-        return this.xMsCopySource;
+    public byte[] getContentMD5() {
+        return CoreUtils.clone(this.contentMD5);
     }
 
     /**
-     * Set the xMsCopySource property: The x-ms-copy-source property.
+     * Set the contentMD5 property: The Content-MD5 property.
      *
-     * @param xMsCopySource the xMsCopySource value to set.
+     * @param contentMD5 the contentMD5 value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsCopySource(String xMsCopySource) {
-        this.xMsCopySource = xMsCopySource;
+    public BlobsGetPropertiesHeaders setContentMD5(byte[] contentMD5) {
+        this.contentMD5 = CoreUtils.clone(contentMD5);
         return this;
     }
 
     /**
-     * Get the xMsBlobSequenceNumber property: The x-ms-blob-sequence-number property.
+     * Get the xMsOrPolicyId property: The x-ms-or-policy-id property.
      *
-     * @return the xMsBlobSequenceNumber value.
+     * @return the xMsOrPolicyId value.
      */
-    public Long getXMsBlobSequenceNumber() {
-        return this.xMsBlobSequenceNumber;
+    public String getXMsOrPolicyId() {
+        return this.xMsOrPolicyId;
     }
 
     /**
-     * Set the xMsBlobSequenceNumber property: The x-ms-blob-sequence-number property.
+     * Set the xMsOrPolicyId property: The x-ms-or-policy-id property.
      *
-     * @param xMsBlobSequenceNumber the xMsBlobSequenceNumber value to set.
+     * @param xMsOrPolicyId the xMsOrPolicyId value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsBlobSequenceNumber(Long xMsBlobSequenceNumber) {
-        this.xMsBlobSequenceNumber = xMsBlobSequenceNumber;
+    public BlobsGetPropertiesHeaders setXMsOrPolicyId(String xMsOrPolicyId) {
+        this.xMsOrPolicyId = xMsOrPolicyId;
         return this;
     }
 
     /**
-     * Get the xMsCopyProgress property: The x-ms-copy-progress property.
+     * Get the cacheControl property: The Cache-Control property.
      *
-     * @return the xMsCopyProgress value.
+     * @return the cacheControl value.
      */
-    public String getXMsCopyProgress() {
-        return this.xMsCopyProgress;
+    public String getCacheControl() {
+        return this.cacheControl;
     }
 
     /**
-     * Set the xMsCopyProgress property: The x-ms-copy-progress property.
+     * Set the cacheControl property: The Cache-Control property.
      *
-     * @param xMsCopyProgress the xMsCopyProgress value to set.
+     * @param cacheControl the cacheControl value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsCopyProgress(String xMsCopyProgress) {
-        this.xMsCopyProgress = xMsCopyProgress;
+    public BlobsGetPropertiesHeaders setCacheControl(String cacheControl) {
+        this.cacheControl = cacheControl;
         return this;
     }
 
     /**
-     * Get the xMsBlobCommittedBlockCount property: The x-ms-blob-committed-block-count property.
+     * Get the eTag property: The ETag property.
      *
-     * @return the xMsBlobCommittedBlockCount value.
+     * @return the eTag value.
      */
-    public Integer getXMsBlobCommittedBlockCount() {
-        return this.xMsBlobCommittedBlockCount;
+    public String getETag() {
+        return this.eTag;
     }
 
     /**
-     * Set the xMsBlobCommittedBlockCount property: The x-ms-blob-committed-block-count property.
+     * Set the eTag property: The ETag property.
      *
-     * @param xMsBlobCommittedBlockCount the xMsBlobCommittedBlockCount value to set.
+     * @param eTag the eTag value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsBlobCommittedBlockCount(Integer xMsBlobCommittedBlockCount) {
-        this.xMsBlobCommittedBlockCount = xMsBlobCommittedBlockCount;
+    public BlobsGetPropertiesHeaders setETag(String eTag) {
+        this.eTag = eTag;
         return this;
     }
 
     /**
-     * Get the xMsMeta property: The x-ms-meta- property.
+     * Get the contentDisposition property: The Content-Disposition property.
      *
-     * @return the xMsMeta value.
+     * @return the contentDisposition value.
      */
-    public Map<String, String> getXMsMeta() {
-        return this.xMsMeta;
+    public String getContentDisposition() {
+        return this.contentDisposition;
     }
 
     /**
-     * Set the xMsMeta property: The x-ms-meta- property.
+     * Set the contentDisposition property: The Content-Disposition property.
      *
-     * @param xMsMeta the xMsMeta value to set.
+     * @param contentDisposition the contentDisposition value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsMeta(Map<String, String> xMsMeta) {
-        this.xMsMeta = xMsMeta;
+    public BlobsGetPropertiesHeaders setContentDisposition(String contentDisposition) {
+        this.contentDisposition = contentDisposition;
         return this;
     }
 
     /**
-     * Get the dateProperty property: The Date property.
+     * Get the contentLanguage property: The Content-Language property.
      *
-     * @return the dateProperty value.
+     * @return the contentLanguage value.
      */
-    public OffsetDateTime getDateProperty() {
-        if (this.dateProperty == null) {
-            return null;
-        }
-        return this.dateProperty.getDateTime();
+    public String getContentLanguage() {
+        return this.contentLanguage;
     }
 
     /**
-     * Set the dateProperty property: The Date property.
+     * Set the contentLanguage property: The Content-Language property.
      *
-     * @param dateProperty the dateProperty value to set.
+     * @param contentLanguage the contentLanguage value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setDateProperty(OffsetDateTime dateProperty) {
-        if (dateProperty == null) {
-            this.dateProperty = null;
-        } else {
-            this.dateProperty = new DateTimeRfc1123(dateProperty);
-        }
+    public BlobsGetPropertiesHeaders setContentLanguage(String contentLanguage) {
+        this.contentLanguage = contentLanguage;
         return this;
     }
 
     /**
-     * Get the xMsExpiryTime property: The x-ms-expiry-time property.
+     * Get the xMsClientRequestId property: The x-ms-client-request-id property.
      *
-     * @return the xMsExpiryTime value.
+     * @return the xMsClientRequestId value.
      */
-    public OffsetDateTime getXMsExpiryTime() {
-        if (this.xMsExpiryTime == null) {
-            return null;
-        }
-        return this.xMsExpiryTime.getDateTime();
+    public String getXMsClientRequestId() {
+        return this.xMsClientRequestId;
     }
 
     /**
-     * Set the xMsExpiryTime property: The x-ms-expiry-time property.
+     * Set the xMsClientRequestId property: The x-ms-client-request-id property.
      *
-     * @param xMsExpiryTime the xMsExpiryTime value to set.
+     * @param xMsClientRequestId the xMsClientRequestId value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsExpiryTime(OffsetDateTime xMsExpiryTime) {
-        if (xMsExpiryTime == null) {
-            this.xMsExpiryTime = null;
-        } else {
-            this.xMsExpiryTime = new DateTimeRfc1123(xMsExpiryTime);
-        }
+    public BlobsGetPropertiesHeaders setXMsClientRequestId(String xMsClientRequestId) {
+        this.xMsClientRequestId = xMsClientRequestId;
         return this;
     }
 
     /**
-     * Get the contentMD5 property: The Content-MD5 property.
+     * Get the xMsOr property: The x-ms-or- property.
      *
-     * @return the contentMD5 value.
+     * @return the xMsOr value.
      */
-    public byte[] getContentMD5() {
-        return CoreUtils.clone(this.contentMD5);
+    public Map<String, String> getXMsOr() {
+        return this.xMsOr;
     }
 
     /**
-     * Set the contentMD5 property: The Content-MD5 property.
+     * Set the xMsOr property: The x-ms-or- property.
      *
-     * @param contentMD5 the contentMD5 value to set.
+     * @param xMsOr the xMsOr value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setContentMD5(byte[] contentMD5) {
-        this.contentMD5 = CoreUtils.clone(contentMD5);
+    public BlobsGetPropertiesHeaders setXMsOr(Map<String, String> xMsOr) {
+        this.xMsOr = xMsOr;
         return this;
     }
 
     /**
-     * Get the xMsCopyCompletionTime property: The x-ms-copy-completion-time property.
+     * Get the xMsEncryptionScope property: The x-ms-encryption-scope property.
      *
-     * @return the xMsCopyCompletionTime value.
+     * @return the xMsEncryptionScope value.
      */
-    public OffsetDateTime getXMsCopyCompletionTime() {
-        if (this.xMsCopyCompletionTime == null) {
+    public String getXMsEncryptionScope() {
+        return this.xMsEncryptionScope;
+    }
+
+    /**
+     * Set the xMsEncryptionScope property: The x-ms-encryption-scope property.
+     *
+     * @param xMsEncryptionScope the xMsEncryptionScope value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsEncryptionScope(String xMsEncryptionScope) {
+        this.xMsEncryptionScope = xMsEncryptionScope;
+        return this;
+    }
+
+    /**
+     * Get the xMsTagCount property: The x-ms-tag-count property.
+     *
+     * @return the xMsTagCount value.
+     */
+    public Long getXMsTagCount() {
+        return this.xMsTagCount;
+    }
+
+    /**
+     * Set the xMsTagCount property: The x-ms-tag-count property.
+     *
+     * @param xMsTagCount the xMsTagCount value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsTagCount(Long xMsTagCount) {
+        this.xMsTagCount = xMsTagCount;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The Last-Modified property.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime getLastModified() {
+        if (this.lastModified == null) {
             return null;
         }
-        return this.xMsCopyCompletionTime.getDateTime();
+        return this.lastModified.getDateTime();
     }
 
     /**
-     * Set the xMsCopyCompletionTime property: The x-ms-copy-completion-time property.
+     * Set the lastModified property: The Last-Modified property.
      *
-     * @param xMsCopyCompletionTime the xMsCopyCompletionTime value to set.
+     * @param lastModified the lastModified value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsCopyCompletionTime(OffsetDateTime xMsCopyCompletionTime) {
-        if (xMsCopyCompletionTime == null) {
-            this.xMsCopyCompletionTime = null;
+    public BlobsGetPropertiesHeaders setLastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
         } else {
-            this.xMsCopyCompletionTime = new DateTimeRfc1123(xMsCopyCompletionTime);
+            this.lastModified = new DateTimeRfc1123(lastModified);
         }
         return this;
     }
 
     /**
-     * Get the acceptRanges property: The Accept-Ranges property.
+     * Get the xMsAccessTierInferred property: The x-ms-access-tier-inferred property.
      *
-     * @return the acceptRanges value.
+     * @return the xMsAccessTierInferred value.
      */
-    public String getAcceptRanges() {
-        return this.acceptRanges;
+    public Boolean isXMsAccessTierInferred() {
+        return this.xMsAccessTierInferred;
     }
 
     /**
-     * Set the acceptRanges property: The Accept-Ranges property.
+     * Set the xMsAccessTierInferred property: The x-ms-access-tier-inferred property.
      *
-     * @param acceptRanges the acceptRanges value to set.
+     * @param xMsAccessTierInferred the xMsAccessTierInferred value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setAcceptRanges(String acceptRanges) {
-        this.acceptRanges = acceptRanges;
+    public BlobsGetPropertiesHeaders setXMsAccessTierInferred(Boolean xMsAccessTierInferred) {
+        this.xMsAccessTierInferred = xMsAccessTierInferred;
         return this;
     }
 
     /**
-     * Get the xMsServerEncrypted property: The x-ms-server-encrypted property.
+     * Get the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
      *
-     * @return the xMsServerEncrypted value.
+     * @return the xMsImmutabilityPolicyMode value.
      */
-    public Boolean isXMsServerEncrypted() {
-        return this.xMsServerEncrypted;
+    public BlobImmutabilityPolicyMode getXMsImmutabilityPolicyMode() {
+        return this.xMsImmutabilityPolicyMode;
     }
 
     /**
-     * Set the xMsServerEncrypted property: The x-ms-server-encrypted property.
+     * Set the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
      *
-     * @param xMsServerEncrypted the xMsServerEncrypted value to set.
+     * @param xMsImmutabilityPolicyMode the xMsImmutabilityPolicyMode value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsServerEncrypted(Boolean xMsServerEncrypted) {
-        this.xMsServerEncrypted = xMsServerEncrypted;
+    public BlobsGetPropertiesHeaders setXMsImmutabilityPolicyMode(
+            BlobImmutabilityPolicyMode xMsImmutabilityPolicyMode) {
+        this.xMsImmutabilityPolicyMode = xMsImmutabilityPolicyMode;
         return this;
     }
 
     /**
-     * Get the xMsOrPolicyId property: The x-ms-or-policy-id property.
+     * Get the xMsAccessTier property: The x-ms-access-tier property.
      *
-     * @return the xMsOrPolicyId value.
+     * @return the xMsAccessTier value.
      */
-    public String getXMsOrPolicyId() {
-        return this.xMsOrPolicyId;
+    public String getXMsAccessTier() {
+        return this.xMsAccessTier;
     }
 
     /**
-     * Set the xMsOrPolicyId property: The x-ms-or-policy-id property.
+     * Set the xMsAccessTier property: The x-ms-access-tier property.
      *
-     * @param xMsOrPolicyId the xMsOrPolicyId value to set.
+     * @param xMsAccessTier the xMsAccessTier value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsOrPolicyId(String xMsOrPolicyId) {
-        this.xMsOrPolicyId = xMsOrPolicyId;
+    public BlobsGetPropertiesHeaders setXMsAccessTier(String xMsAccessTier) {
+        this.xMsAccessTier = xMsAccessTier;
         return this;
     }
 
     /**
-     * Get the xMsRehydratePriority property: The x-ms-rehydrate-priority property.
+     * Get the xMsCopyStatusDescription property: The x-ms-copy-status-description property.
      *
-     * @return the xMsRehydratePriority value.
+     * @return the xMsCopyStatusDescription value.
      */
-    public String getXMsRehydratePriority() {
-        return this.xMsRehydratePriority;
+    public String getXMsCopyStatusDescription() {
+        return this.xMsCopyStatusDescription;
     }
 
     /**
-     * Set the xMsRehydratePriority property: The x-ms-rehydrate-priority property.
+     * Set the xMsCopyStatusDescription property: The x-ms-copy-status-description property.
      *
-     * @param xMsRehydratePriority the xMsRehydratePriority value to set.
+     * @param xMsCopyStatusDescription the xMsCopyStatusDescription value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsRehydratePriority(String xMsRehydratePriority) {
-        this.xMsRehydratePriority = xMsRehydratePriority;
+    public BlobsGetPropertiesHeaders setXMsCopyStatusDescription(String xMsCopyStatusDescription) {
+        this.xMsCopyStatusDescription = xMsCopyStatusDescription;
         return this;
     }
 
     /**
-     * Get the cacheControl property: The Cache-Control property.
+     * Get the contentLength property: The Content-Length property.
      *
-     * @return the cacheControl value.
+     * @return the contentLength value.
      */
-    public String getCacheControl() {
-        return this.cacheControl;
+    public Long getContentLength() {
+        return this.contentLength;
     }
 
     /**
-     * Set the cacheControl property: The Cache-Control property.
+     * Set the contentLength property: The Content-Length property.
      *
-     * @param cacheControl the cacheControl value to set.
+     * @param contentLength the contentLength value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setCacheControl(String cacheControl) {
-        this.cacheControl = cacheControl;
+    public BlobsGetPropertiesHeaders setContentLength(Long contentLength) {
+        this.contentLength = contentLength;
         return this;
     }
 
     /**
-     * Get the eTag property: The ETag property.
+     * Get the xMsRequestId property: The x-ms-request-id property.
      *
-     * @return the eTag value.
+     * @return the xMsRequestId value.
      */
-    public String getETag() {
-        return this.eTag;
+    public String getXMsRequestId() {
+        return this.xMsRequestId;
     }
 
     /**
-     * Set the eTag property: The ETag property.
+     * Set the xMsRequestId property: The x-ms-request-id property.
      *
-     * @param eTag the eTag value to set.
+     * @param xMsRequestId the xMsRequestId value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setETag(String eTag) {
-        this.eTag = eTag;
+    public BlobsGetPropertiesHeaders setXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
         return this;
     }
 
     /**
-     * Get the contentDisposition property: The Content-Disposition property.
+     * Get the contentType property: The Content-Type property.
      *
-     * @return the contentDisposition value.
+     * @return the contentType value.
      */
-    public String getContentDisposition() {
-        return this.contentDisposition;
+    public String getContentType() {
+        return this.contentType;
     }
 
     /**
-     * Set the contentDisposition property: The Content-Disposition property.
+     * Set the contentType property: The Content-Type property.
      *
-     * @param contentDisposition the contentDisposition value to set.
+     * @param contentType the contentType value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setContentDisposition(String contentDisposition) {
-        this.contentDisposition = contentDisposition;
+    public BlobsGetPropertiesHeaders setContentType(String contentType) {
+        this.contentType = contentType;
         return this;
     }
 
     /**
-     * Get the xMsCopyStatus property: The x-ms-copy-status property.
+     * Get the xMsLastAccessTime property: The x-ms-last-access-time property.
      *
-     * @return the xMsCopyStatus value.
+     * @return the xMsLastAccessTime value.
      */
-    public CopyStatusType getXMsCopyStatus() {
-        return this.xMsCopyStatus;
+    public OffsetDateTime getXMsLastAccessTime() {
+        if (this.xMsLastAccessTime == null) {
+            return null;
+        }
+        return this.xMsLastAccessTime.getDateTime();
     }
 
     /**
-     * Set the xMsCopyStatus property: The x-ms-copy-status property.
+     * Set the xMsLastAccessTime property: The x-ms-last-access-time property.
      *
-     * @param xMsCopyStatus the xMsCopyStatus value to set.
+     * @param xMsLastAccessTime the xMsLastAccessTime value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsCopyStatus(CopyStatusType xMsCopyStatus) {
-        this.xMsCopyStatus = xMsCopyStatus;
+    public BlobsGetPropertiesHeaders setXMsLastAccessTime(OffsetDateTime xMsLastAccessTime) {
+        if (xMsLastAccessTime == null) {
+            this.xMsLastAccessTime = null;
+        } else {
+            this.xMsLastAccessTime = new DateTimeRfc1123(xMsLastAccessTime);
+        }
         return this;
     }
 
     /**
-     * Get the xMsArchiveStatus property: The x-ms-archive-status property.
+     * Get the xMsCopySource property: The x-ms-copy-source property.
      *
-     * @return the xMsArchiveStatus value.
+     * @return the xMsCopySource value.
      */
-    public String getXMsArchiveStatus() {
-        return this.xMsArchiveStatus;
+    public String getXMsCopySource() {
+        return this.xMsCopySource;
     }
 
     /**
-     * Set the xMsArchiveStatus property: The x-ms-archive-status property.
+     * Set the xMsCopySource property: The x-ms-copy-source property.
      *
-     * @param xMsArchiveStatus the xMsArchiveStatus value to set.
+     * @param xMsCopySource the xMsCopySource value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsArchiveStatus(String xMsArchiveStatus) {
-        this.xMsArchiveStatus = xMsArchiveStatus;
+    public BlobsGetPropertiesHeaders setXMsCopySource(String xMsCopySource) {
+        this.xMsCopySource = xMsCopySource;
         return this;
     }
 
     /**
-     * Get the contentLanguage property: The Content-Language property.
+     * Get the xMsCopyProgress property: The x-ms-copy-progress property.
      *
-     * @return the contentLanguage value.
+     * @return the xMsCopyProgress value.
      */
-    public String getContentLanguage() {
-        return this.contentLanguage;
+    public String getXMsCopyProgress() {
+        return this.xMsCopyProgress;
     }
 
     /**
-     * Set the contentLanguage property: The Content-Language property.
+     * Set the xMsCopyProgress property: The x-ms-copy-progress property.
      *
-     * @param contentLanguage the contentLanguage value to set.
+     * @param xMsCopyProgress the xMsCopyProgress value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setContentLanguage(String contentLanguage) {
-        this.contentLanguage = contentLanguage;
+    public BlobsGetPropertiesHeaders setXMsCopyProgress(String xMsCopyProgress) {
+        this.xMsCopyProgress = xMsCopyProgress;
         return this;
     }
 
     /**
-     * Get the xMsClientRequestId property: The x-ms-client-request-id property.
+     * Get the xMsMeta property: The x-ms-meta- property.
      *
-     * @return the xMsClientRequestId value.
+     * @return the xMsMeta value.
      */
-    public String getXMsClientRequestId() {
-        return this.xMsClientRequestId;
+    public Map<String, String> getXMsMeta() {
+        return this.xMsMeta;
     }
 
     /**
-     * Set the xMsClientRequestId property: The x-ms-client-request-id property.
+     * Set the xMsMeta property: The x-ms-meta- property.
      *
-     * @param xMsClientRequestId the xMsClientRequestId value to set.
+     * @param xMsMeta the xMsMeta value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsClientRequestId(String xMsClientRequestId) {
-        this.xMsClientRequestId = xMsClientRequestId;
+    public BlobsGetPropertiesHeaders setXMsMeta(Map<String, String> xMsMeta) {
+        this.xMsMeta = xMsMeta;
         return this;
     }
 
     /**
-     * Get the xMsOr property: The x-ms-or- property.
+     * Get the dateProperty property: The Date property.
      *
-     * @return the xMsOr value.
+     * @return the dateProperty value.
      */
-    public Map<String, String> getXMsOr() {
-        return this.xMsOr;
+    public OffsetDateTime getDateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.getDateTime();
     }
 
     /**
-     * Set the xMsOr property: The x-ms-or- property.
+     * Set the dateProperty property: The Date property.
      *
-     * @param xMsOr the xMsOr value to set.
+     * @param dateProperty the dateProperty value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsOr(Map<String, String> xMsOr) {
-        this.xMsOr = xMsOr;
+    public BlobsGetPropertiesHeaders setDateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
         return this;
     }
 
     /**
-     * Get the xMsEncryptionScope property: The x-ms-encryption-scope property.
+     * Get the xMsExpiryTime property: The x-ms-expiry-time property.
      *
-     * @return the xMsEncryptionScope value.
+     * @return the xMsExpiryTime value.
      */
-    public String getXMsEncryptionScope() {
-        return this.xMsEncryptionScope;
+    public OffsetDateTime getXMsExpiryTime() {
+        if (this.xMsExpiryTime == null) {
+            return null;
+        }
+        return this.xMsExpiryTime.getDateTime();
     }
 
     /**
-     * Set the xMsEncryptionScope property: The x-ms-encryption-scope property.
+     * Set the xMsExpiryTime property: The x-ms-expiry-time property.
      *
-     * @param xMsEncryptionScope the xMsEncryptionScope value to set.
+     * @param xMsExpiryTime the xMsExpiryTime value to set.
      * @return the BlobsGetPropertiesHeaders object itself.
      */
-    public BlobsGetPropertiesHeaders setXMsEncryptionScope(String xMsEncryptionScope) {
-        this.xMsEncryptionScope = xMsEncryptionScope;
+    public BlobsGetPropertiesHeaders setXMsExpiryTime(OffsetDateTime xMsExpiryTime) {
+        if (xMsExpiryTime == null) {
+            this.xMsExpiryTime = null;
+        } else {
+            this.xMsExpiryTime = new DateTimeRfc1123(xMsExpiryTime);
+        }
+        return this;
+    }
+
+    /**
+     * Get the xMsCopyCompletionTime property: The x-ms-copy-completion-time property.
+     *
+     * @return the xMsCopyCompletionTime value.
+     */
+    public OffsetDateTime getXMsCopyCompletionTime() {
+        if (this.xMsCopyCompletionTime == null) {
+            return null;
+        }
+        return this.xMsCopyCompletionTime.getDateTime();
+    }
+
+    /**
+     * Set the xMsCopyCompletionTime property: The x-ms-copy-completion-time property.
+     *
+     * @param xMsCopyCompletionTime the xMsCopyCompletionTime value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsCopyCompletionTime(OffsetDateTime xMsCopyCompletionTime) {
+        if (xMsCopyCompletionTime == null) {
+            this.xMsCopyCompletionTime = null;
+        } else {
+            this.xMsCopyCompletionTime = new DateTimeRfc1123(xMsCopyCompletionTime);
+        }
+        return this;
+    }
+
+    /**
+     * Get the acceptRanges property: The Accept-Ranges property.
+     *
+     * @return the acceptRanges value.
+     */
+    public String getAcceptRanges() {
+        return this.acceptRanges;
+    }
+
+    /**
+     * Set the acceptRanges property: The Accept-Ranges property.
+     *
+     * @param acceptRanges the acceptRanges value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setAcceptRanges(String acceptRanges) {
+        this.acceptRanges = acceptRanges;
+        return this;
+    }
+
+    /**
+     * Get the xMsServerEncrypted property: The x-ms-server-encrypted property.
+     *
+     * @return the xMsServerEncrypted value.
+     */
+    public Boolean isXMsServerEncrypted() {
+        return this.xMsServerEncrypted;
+    }
+
+    /**
+     * Set the xMsServerEncrypted property: The x-ms-server-encrypted property.
+     *
+     * @param xMsServerEncrypted the xMsServerEncrypted value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsServerEncrypted(Boolean xMsServerEncrypted) {
+        this.xMsServerEncrypted = xMsServerEncrypted;
+        return this;
+    }
+
+    /**
+     * Get the xMsRehydratePriority property: The x-ms-rehydrate-priority property.
+     *
+     * @return the xMsRehydratePriority value.
+     */
+    public String getXMsRehydratePriority() {
+        return this.xMsRehydratePriority;
+    }
+
+    /**
+     * Set the xMsRehydratePriority property: The x-ms-rehydrate-priority property.
+     *
+     * @param xMsRehydratePriority the xMsRehydratePriority value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsRehydratePriority(String xMsRehydratePriority) {
+        this.xMsRehydratePriority = xMsRehydratePriority;
+        return this;
+    }
+
+    /**
+     * Get the xMsCopyStatus property: The x-ms-copy-status property.
+     *
+     * @return the xMsCopyStatus value.
+     */
+    public CopyStatusType getXMsCopyStatus() {
+        return this.xMsCopyStatus;
+    }
+
+    /**
+     * Set the xMsCopyStatus property: The x-ms-copy-status property.
+     *
+     * @param xMsCopyStatus the xMsCopyStatus value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsCopyStatus(CopyStatusType xMsCopyStatus) {
+        this.xMsCopyStatus = xMsCopyStatus;
+        return this;
+    }
+
+    /**
+     * Get the xMsArchiveStatus property: The x-ms-archive-status property.
+     *
+     * @return the xMsArchiveStatus value.
+     */
+    public String getXMsArchiveStatus() {
+        return this.xMsArchiveStatus;
+    }
+
+    /**
+     * Set the xMsArchiveStatus property: The x-ms-archive-status property.
+     *
+     * @param xMsArchiveStatus the xMsArchiveStatus value to set.
+     * @return the BlobsGetPropertiesHeaders object itself.
+     */
+    public BlobsGetPropertiesHeaders setXMsArchiveStatus(String xMsArchiveStatus) {
+        this.xMsArchiveStatus = xMsArchiveStatus;
         return this;
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
new file mode 100644
index 000000000000..74eb4099d88f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
@@ -0,0 +1,188 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.DateTimeRfc1123;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/** The BlobsSetImmutabilityPolicyHeaders model. */
+@JacksonXmlRootElement(localName = "null")
+@Fluent
+public final class BlobsSetImmutabilityPolicyHeaders {
+    /*
+     * The x-ms-immutability-policy-mode property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-mode")
+    private BlobImmutabilityPolicyMode xMsImmutabilityPolicyMode;
+
+    /*
+     * The x-ms-version property.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String xMsVersion;
+
+    /*
+     * The x-ms-immutability-policy-until-date property.
+     */
+    @JsonProperty(value = "x-ms-immutability-policy-until-date")
+    private DateTimeRfc1123 xMsImmutabilityPolicyUntilDate;
+
+    /*
+     * The x-ms-request-id property.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /*
+     * The x-ms-client-request-id property.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String xMsClientRequestId;
+
+    /*
+     * The Date property.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
+     *
+     * @return the xMsImmutabilityPolicyMode value.
+     */
+    public BlobImmutabilityPolicyMode getXMsImmutabilityPolicyMode() {
+        return this.xMsImmutabilityPolicyMode;
+    }
+
+    /**
+     * Set the xMsImmutabilityPolicyMode property: The x-ms-immutability-policy-mode property.
+     *
+     * @param xMsImmutabilityPolicyMode the xMsImmutabilityPolicyMode value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setXMsImmutabilityPolicyMode(
+            BlobImmutabilityPolicyMode xMsImmutabilityPolicyMode) {
+        this.xMsImmutabilityPolicyMode = xMsImmutabilityPolicyMode;
+        return this;
+    }
+
+    /**
+     * Get the xMsVersion property: The x-ms-version property.
+     *
+     * @return the xMsVersion value.
+     */
+    public String getXMsVersion() {
+        return this.xMsVersion;
+    }
+
+    /**
+     * Set the xMsVersion property: The x-ms-version property.
+     *
+     * @param xMsVersion the xMsVersion value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setXMsVersion(String xMsVersion) {
+        this.xMsVersion = xMsVersion;
+        return this;
+    }
+
+    /**
+     * Get the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
+     *
+     * @return the xMsImmutabilityPolicyUntilDate value.
+     */
+    public OffsetDateTime getXMsImmutabilityPolicyUntilDate() {
+        if (this.xMsImmutabilityPolicyUntilDate == null) {
+            return null;
+        }
+        return this.xMsImmutabilityPolicyUntilDate.getDateTime();
+    }
+
+    /**
+     * Set the xMsImmutabilityPolicyUntilDate property: The x-ms-immutability-policy-until-date property.
+     *
+     * @param xMsImmutabilityPolicyUntilDate the xMsImmutabilityPolicyUntilDate value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setXMsImmutabilityPolicyUntilDate(
+            OffsetDateTime xMsImmutabilityPolicyUntilDate) {
+        if (xMsImmutabilityPolicyUntilDate == null) {
+            this.xMsImmutabilityPolicyUntilDate = null;
+        } else {
+            this.xMsImmutabilityPolicyUntilDate = new DateTimeRfc1123(xMsImmutabilityPolicyUntilDate);
+        }
+        return this;
+    }
+
+    /**
+     * Get the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @return the xMsRequestId value.
+     */
+    public String getXMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @param xMsRequestId the xMsRequestId value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @return the xMsClientRequestId value.
+     */
+    public String getXMsClientRequestId() {
+        return this.xMsClientRequestId;
+    }
+
+    /**
+     * Set the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @param xMsClientRequestId the xMsClientRequestId value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setXMsClientRequestId(String xMsClientRequestId) {
+        this.xMsClientRequestId = xMsClientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: The Date property.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime getDateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.getDateTime();
+    }
+
+    /**
+     * Set the dateProperty property: The Date property.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobsSetImmutabilityPolicyHeaders object itself.
+     */
+    public BlobsSetImmutabilityPolicyHeaders setDateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyResponse.java
new file mode 100644
index 000000000000..20ac86d899b3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyResponse.java
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/** Contains all response data for the setImmutabilityPolicy operation. */
+public final class BlobsSetImmutabilityPolicyResponse extends ResponseBase<BlobsSetImmutabilityPolicyHeaders, Void> {
+    /**
+     * Creates an instance of BlobsSetImmutabilityPolicyResponse.
+     *
+     * @param request the request which resulted in this BlobsSetImmutabilityPolicyResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsSetImmutabilityPolicyResponse(
+            HttpRequest request,
+            int statusCode,
+            HttpHeaders rawHeaders,
+            Void value,
+            BlobsSetImmutabilityPolicyHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldHeaders.java
new file mode 100644
index 000000000000..89535bbe873d
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldHeaders.java
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.DateTimeRfc1123;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
+
+/** The BlobsSetLegalHoldHeaders model. */
+@JacksonXmlRootElement(localName = "null")
+@Fluent
+public final class BlobsSetLegalHoldHeaders {
+    /*
+     * The x-ms-version property.
+     */
+    @JsonProperty(value = "x-ms-version")
+    private String xMsVersion;
+
+    /*
+     * The x-ms-request-id property.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /*
+     * The x-ms-legal-hold property.
+     */
+    @JsonProperty(value = "x-ms-legal-hold")
+    private Boolean xMsLegalHold;
+
+    /*
+     * The x-ms-client-request-id property.
+     */
+    @JsonProperty(value = "x-ms-client-request-id")
+    private String xMsClientRequestId;
+
+    /*
+     * The Date property.
+     */
+    @JsonProperty(value = "Date")
+    private DateTimeRfc1123 dateProperty;
+
+    /**
+     * Get the xMsVersion property: The x-ms-version property.
+     *
+     * @return the xMsVersion value.
+     */
+    public String getXMsVersion() {
+        return this.xMsVersion;
+    }
+
+    /**
+     * Set the xMsVersion property: The x-ms-version property.
+     *
+     * @param xMsVersion the xMsVersion value to set.
+     * @return the BlobsSetLegalHoldHeaders object itself.
+     */
+    public BlobsSetLegalHoldHeaders setXMsVersion(String xMsVersion) {
+        this.xMsVersion = xMsVersion;
+        return this;
+    }
+
+    /**
+     * Get the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @return the xMsRequestId value.
+     */
+    public String getXMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set the xMsRequestId property: The x-ms-request-id property.
+     *
+     * @param xMsRequestId the xMsRequestId value to set.
+     * @return the BlobsSetLegalHoldHeaders object itself.
+     */
+    public BlobsSetLegalHoldHeaders setXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get the xMsLegalHold property: The x-ms-legal-hold property.
+     *
+     * @return the xMsLegalHold value.
+     */
+    public Boolean isXMsLegalHold() {
+        return this.xMsLegalHold;
+    }
+
+    /**
+     * Set the xMsLegalHold property: The x-ms-legal-hold property.
+     *
+     * @param xMsLegalHold the xMsLegalHold value to set.
+     * @return the BlobsSetLegalHoldHeaders object itself.
+     */
+    public BlobsSetLegalHoldHeaders setXMsLegalHold(Boolean xMsLegalHold) {
+        this.xMsLegalHold = xMsLegalHold;
+        return this;
+    }
+
+    /**
+     * Get the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @return the xMsClientRequestId value.
+     */
+    public String getXMsClientRequestId() {
+        return this.xMsClientRequestId;
+    }
+
+    /**
+     * Set the xMsClientRequestId property: The x-ms-client-request-id property.
+     *
+     * @param xMsClientRequestId the xMsClientRequestId value to set.
+     * @return the BlobsSetLegalHoldHeaders object itself.
+     */
+    public BlobsSetLegalHoldHeaders setXMsClientRequestId(String xMsClientRequestId) {
+        this.xMsClientRequestId = xMsClientRequestId;
+        return this;
+    }
+
+    /**
+     * Get the dateProperty property: The Date property.
+     *
+     * @return the dateProperty value.
+     */
+    public OffsetDateTime getDateProperty() {
+        if (this.dateProperty == null) {
+            return null;
+        }
+        return this.dateProperty.getDateTime();
+    }
+
+    /**
+     * Set the dateProperty property: The Date property.
+     *
+     * @param dateProperty the dateProperty value to set.
+     * @return the BlobsSetLegalHoldHeaders object itself.
+     */
+    public BlobsSetLegalHoldHeaders setDateProperty(OffsetDateTime dateProperty) {
+        if (dateProperty == null) {
+            this.dateProperty = null;
+        } else {
+            this.dateProperty = new DateTimeRfc1123(dateProperty);
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldResponse.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldResponse.java
new file mode 100644
index 000000000000..ec2b956fde42
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetLegalHoldResponse.java
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+
+/** Contains all response data for the setLegalHold operation. */
+public final class BlobsSetLegalHoldResponse extends ResponseBase<BlobsSetLegalHoldHeaders, Void> {
+    /**
+     * Creates an instance of BlobsSetLegalHoldResponse.
+     *
+     * @param request the request which resulted in this BlobsSetLegalHoldResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public BlobsSetLegalHoldResponse(
+            HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value, BlobsSetLegalHoldHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ContainersGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ContainersGetPropertiesHeaders.java
index f83c5a9cf40a..53e1398f6958 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ContainersGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ContainersGetPropertiesHeaders.java
@@ -32,6 +32,12 @@ public final class ContainersGetPropertiesHeaders {
     @JsonProperty(value = "x-ms-version")
     private String xMsVersion;
 
+    /*
+     * The x-ms-immutable-storage-with-versioning-enabled property.
+     */
+    @JsonProperty(value = "x-ms-immutable-storage-with-versioning-enabled")
+    private Boolean xMsImmutableStorageWithVersioningEnabled;
+
     /*
      * The x-ms-lease-state property.
      */
@@ -150,6 +156,29 @@ public ContainersGetPropertiesHeaders setXMsVersion(String xMsVersion) {
         return this;
     }
 
+    /**
+     * Get the xMsImmutableStorageWithVersioningEnabled property: The x-ms-immutable-storage-with-versioning-enabled
+     * property.
+     *
+     * @return the xMsImmutableStorageWithVersioningEnabled value.
+     */
+    public Boolean isXMsImmutableStorageWithVersioningEnabled() {
+        return this.xMsImmutableStorageWithVersioningEnabled;
+    }
+
+    /**
+     * Set the xMsImmutableStorageWithVersioningEnabled property: The x-ms-immutable-storage-with-versioning-enabled
+     * property.
+     *
+     * @param xMsImmutableStorageWithVersioningEnabled the xMsImmutableStorageWithVersioningEnabled value to set.
+     * @return the ContainersGetPropertiesHeaders object itself.
+     */
+    public ContainersGetPropertiesHeaders setXMsImmutableStorageWithVersioningEnabled(
+            Boolean xMsImmutableStorageWithVersioningEnabled) {
+        this.xMsImmutableStorageWithVersioningEnabled = xMsImmutableStorageWithVersioningEnabled;
+        return this;
+    }
+
     /**
      * Get the xMsLeaseState property: The x-ms-lease-state property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
index 3be9beca9300..8ee9941b2f2d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
@@ -86,6 +86,12 @@ public final class BlobContainerItemProperties {
     @JsonProperty(value = "RemainingRetentionDays")
     private Integer remainingRetentionDays;
 
+    /*
+     * Indicates if version level worm is enabled on this container.
+     */
+    @JsonProperty(value = "ImmutableStorageWithVersioningEnabled")
+    private Boolean isImmutableStorageWithVersioningEnabled;
+
     /**
      * Get the lastModified property: The Last-Modified property.
      *
@@ -340,4 +346,27 @@ public BlobContainerItemProperties setRemainingRetentionDays(Integer remainingRe
         this.remainingRetentionDays = remainingRetentionDays;
         return this;
     }
+
+    /**
+     * Get the isImmutableStorageWithVersioningEnabled property: Indicates if version level worm is enabled on this
+     * container.
+     *
+     * @return the isImmutableStorageWithVersioningEnabled value.
+     */
+    public Boolean isImmutableStorageWithVersioningEnabled() {
+        return this.isImmutableStorageWithVersioningEnabled;
+    }
+
+    /**
+     * Set the isImmutableStorageWithVersioningEnabled property: Indicates if version level worm is enabled on this
+     * container.
+     *
+     * @param isImmutableStorageWithVersioningEnabled the isImmutableStorageWithVersioningEnabled value to set.
+     * @return the BlobContainerItemProperties object itself.
+     */
+    public BlobContainerItemProperties setIsImmutableStorageWithVersioningEnabled(
+            Boolean isImmutableStorageWithVersioningEnabled) {
+        this.isImmutableStorageWithVersioningEnabled = isImmutableStorageWithVersioningEnabled;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobErrorCode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobErrorCode.java
index 943167b15cc8..c4122d396697 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobErrorCode.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobErrorCode.java
@@ -156,6 +156,10 @@ public final class BlobErrorCode extends ExpandableStringEnum<BlobErrorCode> {
     public static final BlobErrorCode BLOB_TIER_INADEQUATE_FOR_CONTENT_LENGTH =
             fromString("BlobTierInadequateForContentLength");
 
+    /** Static value BlobUsesCustomerSpecifiedEncryption for BlobErrorCode. */
+    public static final BlobErrorCode BLOB_USES_CUSTOMER_SPECIFIED_ENCRYPTION =
+            fromString("BlobUsesCustomerSpecifiedEncryption");
+
     /** Static value BlockCountExceedsLimit for BlobErrorCode. */
     public static final BlobErrorCode BLOCK_COUNT_EXCEEDS_LIMIT = fromString("BlockCountExceedsLimit");
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
index e749e64d3551..ad4397648c4d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
@@ -28,7 +28,13 @@ public enum ListBlobsIncludeItem {
     VERSIONS("versions"),
 
     /** Enum value tags. */
-    TAGS("tags");
+    TAGS("tags"),
+
+    /** Enum value immutabilitypolicy. */
+    IMMUTABILITYPOLICY("immutabilitypolicy"),
+
+    /** Enum value legalhold. */
+    LEGALHOLD("legalhold");
 
     /** The actual serialized value for a ListBlobsIncludeItem instance. */
     private final String value;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
index 8e4b72bed4b6..83a1ba8b4f7f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
@@ -199,8 +199,8 @@ Mono<Response<AppendBlobItem>> createWithResponse(AppendBlobCreateOptions option
             options.getMetadata(), requestConditions.getLeaseId(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
-            context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 AppendBlobsCreateHeaders hd = rb.getDeserializedHeaders();
                 AppendBlobItem item = new AppendBlobItem(hd.getETag(), hd.getLastModified(), hd.getContentMD5(),
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
index a4c4902d264d..8a358e19ecb9 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
@@ -597,7 +597,7 @@ private Mono<BlobCopyInfo> onStart(String sourceUrl, Map<String, String> metadat
                 destinationRequestConditions.getIfModifiedSince(), destinationRequestConditions.getIfUnmodifiedSince(),
                 destinationRequestConditions.getIfMatch(), destinationRequestConditions.getIfNoneMatch(),
                 destinationRequestConditions.getTagsConditions(), destinationRequestConditions.getLeaseId(), null,
-                tagsToString(tags), sealBlob, context))
+                tagsToString(tags), sealBlob, null, null, null, context))
             .map(response -> {
                 final BlobsStartCopyFromURLHeaders headers = response.getDeserializedHeaders();
 
@@ -832,7 +832,7 @@ Mono<Response<String>> copyFromUrlWithResponse(BlobCopyFromUrlOptions options, C
             destRequestConditions.getIfUnmodifiedSince(), destRequestConditions.getIfMatch(),
             destRequestConditions.getIfNoneMatch(), destRequestConditions.getTagsConditions(),
             destRequestConditions.getLeaseId(), null, null,
-            tagsToString(options.getTags()), context)
+            tagsToString(options.getTags()), null, null, null, context)
             .map(rb -> new SimpleResponse<>(rb, rb.getDeserializedHeaders().getXMsCopyId()));
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
index b839c40b56ce..25dd01dc286e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
@@ -267,8 +267,8 @@ Mono<Response<BlockBlobItem>> uploadWithResponse(BlockBlobSimpleUploadOptions op
             requestConditions.getLeaseId(), options.getTier(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
-            context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 BlockBlobsUploadHeaders hd = rb.getDeserializedHeaders();
                 BlockBlobItem item = new BlockBlobItem(hd.getETag(), hd.getLastModified(), hd.getContentMD5(),
@@ -758,8 +758,8 @@ Mono<Response<BlockBlobItem>> commitBlockListWithResponse(BlockBlobCommitBlockLi
             requestConditions.getLeaseId(), options.getTier(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
-            context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 BlockBlobsCommitBlockListHeaders hd = rb.getDeserializedHeaders();
                 BlockBlobItem item = new BlockBlobItem(hd.getETag(), hd.getLastModified(), hd.getContentMD5(),
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
index 8d5d69d04a5f..013f067bd9e7 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
@@ -251,7 +251,7 @@ Mono<Response<PageBlobItem>> createWithResponse(PageBlobCreateOptions options, C
             options.getSize(), null, null, options.getMetadata(), requestConditions.getLeaseId(),
             requestConditions.getIfModifiedSince(), requestConditions.getIfUnmodifiedSince(),
             requestConditions.getIfMatch(), requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(),
-            options.getSequenceNumber(), null, tagsToString(options.getTags()), options.getHeaders(),
+            options.getSequenceNumber(), null, tagsToString(options.getTags()), null, null, null, options.getHeaders(),
             getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
diff --git a/sdk/storage/azure-storage-blob/swagger/README.md b/sdk/storage/azure-storage-blob/swagger/README.md
index 942b05e4aec4..2cfdc9d3b232 100644
--- a/sdk/storage/azure-storage-blob/swagger/README.md
+++ b/sdk/storage/azure-storage-blob/swagger/README.md
@@ -16,7 +16,7 @@ autorest --java --use:@autorest/java@4.0.x
 
 ### Code generation settings
 ``` yaml
-input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.BlobStorage/preview/2020-08-04/blob.json
+input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.BlobStorage/preview/2020-10-02/blob.json
 java: true
 output-folder: ../
 namespace: com.azure.storage.blob

From c4ea5bf3390be918c89703572bdeddf6146fccdd Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Wed, 16 Jun 2021 13:32:46 -0700
Subject: [PATCH 3/9] Reenabled quick query parquet support (#21785)

---
 sdk/storage/azure-storage-blob/CHANGELOG.md   |   1 +
 .../implementation/util/BlobQueryReader.java  |  13 +-
 .../models/BlobQueryParquetSerialization.java |   3 +-
 .../blob/models/BlobQuerySerialization.java   |   9 +-
 .../blob/specialized/BlobBaseAPITest.groovy   |   5 +-
 .../BlobBaseAPITestQueryInputParquet.json     | 135 ++++++++++++++
 .../BlobBaseAPITestQueryParquetOutputIA.json  |  50 +++++
 .../azure-storage-file-datalake/CHANGELOG.md  |   1 +
 .../storage/file/datalake/Transforms.java     |  19 +-
 .../models/FileQueryParquetSerialization.java |   3 +-
 .../models/FileQuerySerialization.java        |   5 +-
 .../storage/file/datalake/FileAPITest.groovy  |   5 +-
 .../FileAPITestQueryInputParquet.json         | 172 ++++++++++++++++++
 .../FileAPITestQueryParquetOutputIA.json      |  47 +++++
 14 files changed, 437 insertions(+), 31 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryInputParquet.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryParquetOutputIA.json
 create mode 100644 sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryInputParquet.json
 create mode 100644 sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryParquetOutputIA.json

diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
index 4b4fb4ecbecd..235efe91476d 100644
--- a/sdk/storage/azure-storage-blob/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 12.12.0-beta.2 (Unreleased)
 - Added support for the 2020-10-02 service version.
+- Added support to specify Parquet Input Serialization when querying a blob.
 
 ## 12.12.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobQueryReader.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobQueryReader.java
index 8f4e6bf16d8e..e1212ef99149 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobQueryReader.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobQueryReader.java
@@ -16,6 +16,7 @@
 import com.azure.storage.blob.models.BlobQueryDelimitedSerialization;
 import com.azure.storage.blob.models.BlobQueryError;
 import com.azure.storage.blob.models.BlobQueryJsonSerialization;
+import com.azure.storage.blob.models.BlobQueryParquetSerialization;
 import com.azure.storage.blob.models.BlobQueryProgress;
 import com.azure.storage.blob.models.BlobQuerySerialization;
 import com.azure.storage.internal.avro.implementation.AvroConstants;
@@ -230,13 +231,12 @@ public static QuerySerialization transformInputSerialization(BlobQuerySerializat
             generatedFormat.setJsonTextConfiguration(transformJson(
                 (BlobQueryJsonSerialization) userSerialization));
 
-            // TODO (gapra): uncomment when parquet is released
-        /*} else if (userSerialization instanceof BlobQueryParquetSerialization) {
+        } else if (userSerialization instanceof BlobQueryParquetSerialization) {
 
             generatedFormat.setType(QueryFormatType.PARQUET);
             generatedFormat.setParquetTextConfiguration(transformParquet(
                 (BlobQueryParquetSerialization) userSerialization));
-        */
+
         } else {
             throw logger.logExceptionAsError(new IllegalArgumentException(
                 "Please see values of valid input serialization in the documentation "
@@ -323,13 +323,14 @@ private static JsonTextConfiguration transformJson(BlobQueryJsonSerialization js
      * @param parquetSerialization {@link BlobQueryParquetSerialization}
      * @return {@link JsonTextConfiguration}
      */
-    // TODO (gapra): uncomment when parquet is released
-    /*private static Object transformParquet(BlobQueryParquetSerialization parquetSerialization) {
+    private static Object transformParquet(BlobQueryParquetSerialization parquetSerialization) {
+        /* This method returns an Object since the ParquetConfiguration currently accepts no options. This results in
+        the generator generating ParquetConfiguration as an Object. */
         if (parquetSerialization == null) {
             return null;
         }
         return new Object();
-    }*/
+    }
 
     /**
      * Transforms a BlobQueryArrowSerialization into a ArrowConfiguration.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQueryParquetSerialization.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQueryParquetSerialization.java
index 003d6fbb74a4..e0bbe3159561 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQueryParquetSerialization.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQueryParquetSerialization.java
@@ -6,5 +6,4 @@
 /**
  * Defines the input parquet serialization for a blob quick query request.
  */
-// TODO (gapra): public when parquet is released
-class BlobQueryParquetSerialization implements BlobQuerySerialization { }
+public final class BlobQueryParquetSerialization implements BlobQuerySerialization { }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQuerySerialization.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQuerySerialization.java
index 1e6cb0031968..fe0771d2fdfe 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQuerySerialization.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobQuerySerialization.java
@@ -2,13 +2,14 @@
 // Licensed under the MIT License.
 
 package com.azure.storage.blob.models;
-// TODO (gapra): add parquet to inputs when parquet is released
+
 /**
  * Defines the input and output serialization for a blob quick query request.
- * either {@link BlobQueryJsonSerialization}, {@link BlobQueryDelimitedSerialization}, or
- * {@link BlobQueryArrowSerialization}.
+ * either {@link BlobQueryJsonSerialization}, {@link BlobQueryDelimitedSerialization},
+ * {@link BlobQueryArrowSerialization}, or {@link BlobQueryParquetSerialization}.
  * <p>
- * Note: {@link BlobQueryArrowSerialization} can only be used as an output.
+ * Note: {@link BlobQueryParquetSerialization} can only be used as an input and
+ * {@link BlobQueryArrowSerialization} can only be used as an output.
  * </p>
  */
 public interface BlobQuerySerialization {
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAPITest.groovy
index 9e21f8256764..1fb584bcfb7f 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlobBaseAPITest.groovy
@@ -301,8 +301,7 @@ class BlobBaseAPITest extends APISpec {
         1000      || _
     }
 
-    @Unroll
-    @Ignore /* TODO: Unignore when parquet is officially supported. */
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Retry(count = 5, delay = 5, condition = { env.testMode == TestMode.LIVE })
     def "Query Input parquet"() {
         setup:
@@ -722,7 +721,7 @@ class BlobBaseAPITest extends APISpec {
         thrown(IllegalArgumentException)
     }
 
-    @Ignore /* TODO: Unignore when parquet is officially supported. */
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Retry(count = 5, delay = 5, condition = { env.testMode == TestMode.LIVE })
     def "Query parquet output IA"() {
         setup:
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryInputParquet.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryInputParquet.json
new file mode 100644
index 000000000000..217179668d06
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryInputParquet.json
@@ -0,0 +1,135 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/64420e75064420e75a361102414ce4cb291ed4999822?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "661d0441-4472-4d22-9970-a9fdd2558da5"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAE1F5D7F4",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "2122760e-f01e-000d-4fd3-572003000000",
+      "x-ms-client-request-id" : "661d0441-4472-4d22-9970-a9fdd2558da5",
+      "Date" : "Wed, 02 Jun 2021 17:21:38 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/64420e75064420e75a361102414ce4cb291ed4999822/64420e75164420e75a3643999d1fa0d3cf6dd4399805",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5148c49d-a919-41ea-bac5-a1751190cfcd",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Wed, 02 Jun 2021 17:21:38 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D925EAE235A6A4",
+      "x-ms-request-id" : "21227632-f01e-000d-68d3-572003000000",
+      "x-ms-client-request-id" : "5148c49d-a919-41ea-bac5-a1751190cfcd"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/64420e75064420e75a361102414ce4cb291ed4999822/64420e75164420e75a3643999d1fa0d3cf6dd4399805",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e524adfb-77b9-4e64-a979-c292bd9be1bc",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "f7IDcRFZujI=",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "Content-MD5" : "z1EKaBGYeFFPXcMBK90K+w==",
+      "eTag" : "0x8D925EAE25A4C5C",
+      "x-ms-request-id" : "21227636-f01e-000d-6cd3-572003000000",
+      "x-ms-client-request-id" : "e524adfb-77b9-4e64-a979-c292bd9be1bc"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/64420e75064420e75a361102414ce4cb291ed4999822/64420e75164420e75a3643999d1fa0d3cf6dd4399805?comp=query",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5f0d84c5-e629-4fd5-bcdf-c504b26c30dd",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-creation-time" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "eTag" : "0x8D925EAE25A4C5C",
+      "x-ms-request-id" : "21227648-f01e-000d-7cd3-572003000000",
+      "Body" : "T2JqAQIWYXZyby5zY2hlbWHOHlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLnJlc3VsdERhdGEiLAogICAgImRvYyI6ICJIb2xkcyByZXN1bHQgZGF0YSBpbiB0aGUgZm9ybWF0IHNwZWNpZmllZCBmb3IgdGhpcyBxdWVyeSAoQ1NWLCBKU09OLCBldGMuKS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImRhdGEiLAogICAgICAgICJ0eXBlIjogImJ5dGVzIgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVycm9yIiwKICAgICJkb2MiOiAiQW4gZXJyb3IgdGhhdCBvY2N1cnJlZCB3aGlsZSBwcm9jZXNzaW5nIHRoZSBxdWVyeS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImZhdGFsIiwKICAgICAgICAidHlwZSI6ICJib29sZWFuIiwKICAgICAgICAiZG9jIjogIklmIHRydWUsIHRoaXMgZXJyb3IgcHJldmVudHMgZnVydGhlciBxdWVyeSBwcm9jZXNzaW5nLiAgTW9yZSByZXN1bHQgZGF0YSBtYXkgYmUgcmV0dXJuZWQsIGJ1dCB0aGVyZSBpcyBubyBndWFyYW50ZWUgdGhhdCBhbGwgb2YgdGhlIG9yaWdpbmFsIGRhdGEgd2lsbCBiZSBwcm9jZXNzZWQuICBJZiBmYWxzZSwgdGhpcyBlcnJvciBkb2VzIG5vdCBwcmV2ZW50IGZ1cnRoZXIgcXVlcnkgcHJvY2Vzc2luZy4iCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJuYW1lIiwKICAgICAgICAidHlwZSI6ICJzdHJpbmciLAogICAgICAgICJkb2MiOiAiVGhlIG5hbWUgb2YgdGhlIGVycm9yIgogICAgICB9LAogICAgICB7CiAgICAgICAgIm5hbWUiOiAiZGVzY3JpcHRpb24iLAogICAgICAgICJ0eXBlIjogInN0cmluZyIsCiAgICAgICAgImRvYyI6ICJBIGRlc2NyaXB0aW9uIG9mIHRoZSBlcnJvciIKICAgICAgfSwKICAgICAgewogICAgICAgICJuYW1lIjogInBvc2l0aW9uIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSByZWNvcmQgb2Zmc2V0IGluIHRoZSBibG9iIGF0IHdoaWNoIHRoZSBlcnJvciBvY2N1cnJlZCIKICAgICAgfQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAgICJuYW1lIjogImNvbS5taWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5wcm9ncmVzcyIsCiAgICAiZG9jIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBwcm9ncmVzcyBvZiB0aGUgcXVlcnkiLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImJ5dGVzU2Nhbm5lZCIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSBiZWVuIHNjYW5uZWQiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgdG8gYmUgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVuZCIsCiAgICAiZG9jIjogIlNlbnQgYXMgdGhlIGZpbmFsIG1lc3NhZ2Ugb2YgdGhlIHJlc3BvbnNlLCBpbmRpY2F0aW5nIHRoYXQgYWxsIHJlc3VsdHMgaGF2ZSBiZWVuIHNlbnQuIiwKICAgICJmaWVsZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfQpdCgB1tyw2OJWZRJNiBWZH4hs1AjwAODAsbWRpZmp0NTUuZWEzLG1kaWZqdDU1LmVhMwp1tyw2OJWZRJNiBWZH4hs1Ag4Ewu4EruMJdbcsNjiVmUSTYgVmR+IbNQIIBq7jCXW3LDY4lZlEk2IFZkfiGzU=",
+      "x-ms-client-request-id" : "5f0d84c5-e629-4fd5-bcdf-c504b26c30dd",
+      "Content-Type" : "avro/binary"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/64420e75064420e75a361102414ce4cb291ed4999822/64420e75164420e75a3643999d1fa0d3cf6dd4399805?comp=query",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f2a3b769-163e-4519-beb4-938c92e65de9",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Wed, 02 Jun 2021 17:21:40 GMT",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-creation-time" : "Wed, 02 Jun 2021 17:21:39 GMT",
+      "eTag" : "0x8D925EAE25A4C5C",
+      "x-ms-request-id" : "21227681-f01e-000d-26d3-572003000000",
+      "Body" : "T2JqAQIWYXZyby5zY2hlbWHOHlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLnJlc3VsdERhdGEiLAogICAgImRvYyI6ICJIb2xkcyByZXN1bHQgZGF0YSBpbiB0aGUgZm9ybWF0IHNwZWNpZmllZCBmb3IgdGhpcyBxdWVyeSAoQ1NWLCBKU09OLCBldGMuKS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImRhdGEiLAogICAgICAgICJ0eXBlIjogImJ5dGVzIgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVycm9yIiwKICAgICJkb2MiOiAiQW4gZXJyb3IgdGhhdCBvY2N1cnJlZCB3aGlsZSBwcm9jZXNzaW5nIHRoZSBxdWVyeS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImZhdGFsIiwKICAgICAgICAidHlwZSI6ICJib29sZWFuIiwKICAgICAgICAiZG9jIjogIklmIHRydWUsIHRoaXMgZXJyb3IgcHJldmVudHMgZnVydGhlciBxdWVyeSBwcm9jZXNzaW5nLiAgTW9yZSByZXN1bHQgZGF0YSBtYXkgYmUgcmV0dXJuZWQsIGJ1dCB0aGVyZSBpcyBubyBndWFyYW50ZWUgdGhhdCBhbGwgb2YgdGhlIG9yaWdpbmFsIGRhdGEgd2lsbCBiZSBwcm9jZXNzZWQuICBJZiBmYWxzZSwgdGhpcyBlcnJvciBkb2VzIG5vdCBwcmV2ZW50IGZ1cnRoZXIgcXVlcnkgcHJvY2Vzc2luZy4iCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJuYW1lIiwKICAgICAgICAidHlwZSI6ICJzdHJpbmciLAogICAgICAgICJkb2MiOiAiVGhlIG5hbWUgb2YgdGhlIGVycm9yIgogICAgICB9LAogICAgICB7CiAgICAgICAgIm5hbWUiOiAiZGVzY3JpcHRpb24iLAogICAgICAgICJ0eXBlIjogInN0cmluZyIsCiAgICAgICAgImRvYyI6ICJBIGRlc2NyaXB0aW9uIG9mIHRoZSBlcnJvciIKICAgICAgfSwKICAgICAgewogICAgICAgICJuYW1lIjogInBvc2l0aW9uIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSByZWNvcmQgb2Zmc2V0IGluIHRoZSBibG9iIGF0IHdoaWNoIHRoZSBlcnJvciBvY2N1cnJlZCIKICAgICAgfQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAgICJuYW1lIjogImNvbS5taWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5wcm9ncmVzcyIsCiAgICAiZG9jIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBwcm9ncmVzcyBvZiB0aGUgcXVlcnkiLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImJ5dGVzU2Nhbm5lZCIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSBiZWVuIHNjYW5uZWQiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgdG8gYmUgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVuZCIsCiAgICAiZG9jIjogIlNlbnQgYXMgdGhlIGZpbmFsIG1lc3NhZ2Ugb2YgdGhlIHJlc3BvbnNlLCBpbmRpY2F0aW5nIHRoYXQgYWxsIHJlc3VsdHMgaGF2ZSBiZWVuIHNlbnQuIiwKICAgICJmaWVsZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfQpdCgAurSZmO/tGT5JVIrK8ppBbAjwAODAsbWRpZmp0NTUuZWEzLG1kaWZqdDU1LmVhMwourSZmO/tGT5JVIrK8ppBbAg4Ewu4EruMJLq0mZjv7Rk+SVSKyvKaQWwIIBq7jCS6tJmY7+0ZPklUisrymkFs=",
+      "x-ms-client-request-id" : "f2a3b769-163e-4519-beb4-938c92e65de9",
+      "Content-Type" : "avro/binary"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "64420e75064420e75a361102414ce4cb291ed4999822", "64420e75164420e75a3643999d1fa0d3cf6dd4399805" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryParquetOutputIA.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryParquetOutputIA.json
new file mode 100644
index 000000000000..589250f1a4a4
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/BlobBaseAPITestQueryParquetOutputIA.json
@@ -0,0 +1,50 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/4708d6d404708d6d4218150164fd49970ca454f7198b?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0dea9a47-11b5-47f4-ada6-5b4bd2f388dc"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAF70EE1C8",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:22:14 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "cd0a813b-101e-0007-79d3-57398a000000",
+      "x-ms-client-request-id" : "0dea9a47-11b5-47f4-ada6-5b4bd2f388dc",
+      "Date" : "Wed, 02 Jun 2021 17:22:14 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/4708d6d404708d6d4218150164fd49970ca454f7198b/4708d6d414708d6d421811428d4b9cc7e47884b4ba99",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4cd98491-bdf3-436c-b760-fe94e8f9e962",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:22:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Wed, 02 Jun 2021 17:22:14 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D925EAF74618D1",
+      "x-ms-request-id" : "cd0a8150-101e-0007-06d3-57398a000000",
+      "x-ms-client-request-id" : "4cd98491-bdf3-436c-b760-fe94e8f9e962"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "4708d6d404708d6d4218150164fd49970ca454f7198b", "4708d6d414708d6d421811428d4b9cc7e47884b4ba99" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
index 5f7d2afa045f..86d8bd919157 100644
--- a/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-file-datalake/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 12.6.0-beta.2 (Unreleased)
 - Added support for the 2020-10-02 service version.
+- Added support to specify Parquet Input Serialization when querying a file.
 
 ## 12.6.0-beta.1 (2021-05-13)
 - Added support for the 2020-08-04 service version.
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/Transforms.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/Transforms.java
index df60063c4a83..955fcdb9780d 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/Transforms.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/Transforms.java
@@ -25,6 +25,7 @@
 import com.azure.storage.blob.models.BlobQueryError;
 import com.azure.storage.blob.models.BlobQueryHeaders;
 import com.azure.storage.blob.models.BlobQueryJsonSerialization;
+import com.azure.storage.blob.models.BlobQueryParquetSerialization;
 import com.azure.storage.blob.models.BlobQueryProgress;
 import com.azure.storage.blob.models.BlobQueryResponse;
 import com.azure.storage.blob.models.BlobQuerySerialization;
@@ -60,6 +61,7 @@
 import com.azure.storage.file.datalake.models.FileQueryError;
 import com.azure.storage.file.datalake.models.FileQueryHeaders;
 import com.azure.storage.file.datalake.models.FileQueryJsonSerialization;
+import com.azure.storage.file.datalake.models.FileQueryParquetSerialization;
 import com.azure.storage.file.datalake.models.FileQueryProgress;
 import com.azure.storage.file.datalake.models.FileQueryResponse;
 import com.azure.storage.file.datalake.models.FileQuerySerialization;
@@ -94,6 +96,11 @@
 
 class Transforms {
 
+    private static final String SERIALIZATION_MESSAGE = String.format("'serialization' must be one of %s, %s, %s or "
+            + "%s.", FileQueryJsonSerialization.class.getSimpleName(),
+        FileQueryDelimitedSerialization.class.getSimpleName(), FileQueryArrowSerialization.class.getSimpleName(),
+        FileQueryParquetSerialization.class.getSimpleName());
+
     static com.azure.storage.blob.models.PublicAccessType toBlobPublicAccessType(PublicAccessType
         fileSystemPublicAccessType) {
         if (fileSystemPublicAccessType == null) {
@@ -444,16 +451,10 @@ static BlobQuerySerialization toBlobQuerySerialization(FileQuerySerialization se
         } else if (ser instanceof FileQueryArrowSerialization) {
             FileQueryArrowSerialization arrSer = (FileQueryArrowSerialization) ser;
             return new BlobQueryArrowSerialization().setSchema(toBlobQueryArrowSchema(arrSer.getSchema()));
-            // TODO (gapra): uncomment when parquet is released
-        /*} else if (ser instanceof FileQueryParquetSerialization) {
-            return new BlobQueryParquetSerialization(); */
+        } else if (ser instanceof FileQueryParquetSerialization) {
+            return new BlobQueryParquetSerialization();
         } else {
-            throw new IllegalArgumentException(
-                String.format("'serialization' must be one of %s, %s, or %s",
-                    FileQueryJsonSerialization.class.getSimpleName(),
-                    FileQueryDelimitedSerialization.class.getSimpleName(),
-                    FileQueryArrowSerialization.class.getSimpleName()
-                    /*FileQueryParquetSerialization.class.getSimpleName()*/));
+            throw new IllegalArgumentException(SERIALIZATION_MESSAGE);
         }
     }
 
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryParquetSerialization.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryParquetSerialization.java
index 5d8cc5597210..72f960e11275 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryParquetSerialization.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryParquetSerialization.java
@@ -6,5 +6,4 @@
 /**
  * Defines the input parquet serialization for a file quick query request.
  */
-// TODO (gapra): public when parquet is released
-class FileQueryParquetSerialization implements FileQuerySerialization { }
+public final class FileQueryParquetSerialization implements FileQuerySerialization { }
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
index 0b5f12eeedc7..7cdff347b771 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
@@ -7,9 +7,10 @@
 /**
  * Defines the input and output serialization for a file quick query request.
  * either {@link FileQueryJsonSerialization}, {@link FileQueryDelimitedSerialization},
- * {@link FileQueryArrowSerialization}.
+ * {@link FileQueryArrowSerialization}, or {@link FileQueryParquetSerialization}.
  * <p>
- * Note: {@link FileQueryArrowSerialization} can only be used as an output.
+ * Note: {@link FileQueryParquetSerialization} can only be used as an input and
+ *  {@link FileQueryArrowSerialization} can only be used as an output.
  * </p>
  */
 public interface FileQuerySerialization {
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
index 06ae54733b87..1c76d390ee2d 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
+++ b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
@@ -3167,8 +3167,7 @@ class FileAPITest extends APISpec {
         1000      | '\n'            || _
     }
 
-    @Unroll
-    @Ignore /* TODO: Unignore when parquet is officially supported. */
+    @RequiredServiceVersion(clazz = DataLakeServiceVersion.class, min = "V2020_10_02")
     @Retry(count = 5, delay = 5, condition = { env.testMode == TestMode.LIVE })
     def "Query Input parquet"() {
         setup:
@@ -3555,7 +3554,7 @@ class FileAPITest extends APISpec {
         thrown(IllegalArgumentException)
     }
 
-    @Ignore /* TODO: Unignore when parquet is officially supported. */
+    @RequiredServiceVersion(clazz = DataLakeServiceVersion.class, min = "V2020_10_02")
     @Retry(count = 5, delay = 5, condition = { env.testMode == TestMode.LIVE })
     def "Query parquet output IA"() {
         setup:
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryInputParquet.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryInputParquet.json
new file mode 100644
index 000000000000..c4ba2ca7c229
--- /dev/null
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryInputParquet.json
@@ -0,0 +1,172 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6a5679c1-2c62-4f4f-806e-4851e55e4162"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAAF3AC0F7",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:14 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "411db120-601e-0003-35d3-57cc08000000",
+      "x-ms-client-request-id" : "6a5679c1-2c62-4f4f-806e-4851e55e4162",
+      "Date" : "Wed, 02 Jun 2021 17:20:13 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.dfs.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?resource=file",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bc94d4e4-057b-4cd0-8bef-dd9df04c2521"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAAFC0E323",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-request-id" : "3a459b5a-e01f-0012-77d3-57fb13000000",
+      "x-ms-client-request-id" : "bc94d4e4-057b-4cd0-8bef-dd9df04c2521",
+      "Date" : "Wed, 02 Jun 2021 17:20:14 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.dfs.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?resource=file",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0324fd53-2a79-405b-bd86-c778fc7e70e5"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAAFE4C55C",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-request-id" : "3a459b5b-e01f-0012-78d3-57fb13000000",
+      "x-ms-client-request-id" : "0324fd53-2a79-405b-bd86-c778fc7e70e5",
+      "Date" : "Wed, 02 Jun 2021 17:20:14 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PATCH",
+    "Uri" : "https://REDACTED.dfs.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?action=append&position=0",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9e4bafc1-3cfc-4a2a-9563-e1ad3e6015fd",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-request-id" : "3a459b5c-e01f-0012-79d3-57fb13000000",
+      "x-ms-client-request-id" : "9e4bafc1-3cfc-4a2a-9563-e1ad3e6015fd",
+      "Date" : "Wed, 02 Jun 2021 17:20:15 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PATCH",
+    "Uri" : "https://REDACTED.dfs.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?action=flush&position=80087&retainUncommittedData=false&close=false",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cc313fc1-f998-43c8-af4d-4243bf0efab5"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EAB023AE92",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-server-encrypted" : "false",
+      "x-ms-request-id" : "3a459b5d-e01f-0012-7ad3-57fb13000000",
+      "x-ms-client-request-id" : "cc313fc1-f998-43c8-af4d-4243bf0efab5",
+      "Date" : "Wed, 02 Jun 2021 17:20:15 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?comp=query",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "86bbabe8-592a-4ba8-a947-da8e2d28cb44",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-creation-time" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "eTag" : "0x8D925EAB023AE92",
+      "x-ms-request-id" : "411db193-601e-0003-04d3-57cc08000000",
+      "Body" : "T2JqAQIWYXZyby5zY2hlbWHOHlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLnJlc3VsdERhdGEiLAogICAgImRvYyI6ICJIb2xkcyByZXN1bHQgZGF0YSBpbiB0aGUgZm9ybWF0IHNwZWNpZmllZCBmb3IgdGhpcyBxdWVyeSAoQ1NWLCBKU09OLCBldGMuKS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImRhdGEiLAogICAgICAgICJ0eXBlIjogImJ5dGVzIgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVycm9yIiwKICAgICJkb2MiOiAiQW4gZXJyb3IgdGhhdCBvY2N1cnJlZCB3aGlsZSBwcm9jZXNzaW5nIHRoZSBxdWVyeS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImZhdGFsIiwKICAgICAgICAidHlwZSI6ICJib29sZWFuIiwKICAgICAgICAiZG9jIjogIklmIHRydWUsIHRoaXMgZXJyb3IgcHJldmVudHMgZnVydGhlciBxdWVyeSBwcm9jZXNzaW5nLiAgTW9yZSByZXN1bHQgZGF0YSBtYXkgYmUgcmV0dXJuZWQsIGJ1dCB0aGVyZSBpcyBubyBndWFyYW50ZWUgdGhhdCBhbGwgb2YgdGhlIG9yaWdpbmFsIGRhdGEgd2lsbCBiZSBwcm9jZXNzZWQuICBJZiBmYWxzZSwgdGhpcyBlcnJvciBkb2VzIG5vdCBwcmV2ZW50IGZ1cnRoZXIgcXVlcnkgcHJvY2Vzc2luZy4iCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJuYW1lIiwKICAgICAgICAidHlwZSI6ICJzdHJpbmciLAogICAgICAgICJkb2MiOiAiVGhlIG5hbWUgb2YgdGhlIGVycm9yIgogICAgICB9LAogICAgICB7CiAgICAgICAgIm5hbWUiOiAiZGVzY3JpcHRpb24iLAogICAgICAgICJ0eXBlIjogInN0cmluZyIsCiAgICAgICAgImRvYyI6ICJBIGRlc2NyaXB0aW9uIG9mIHRoZSBlcnJvciIKICAgICAgfSwKICAgICAgewogICAgICAgICJuYW1lIjogInBvc2l0aW9uIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSByZWNvcmQgb2Zmc2V0IGluIHRoZSBibG9iIGF0IHdoaWNoIHRoZSBlcnJvciBvY2N1cnJlZCIKICAgICAgfQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAgICJuYW1lIjogImNvbS5taWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5wcm9ncmVzcyIsCiAgICAiZG9jIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBwcm9ncmVzcyBvZiB0aGUgcXVlcnkiLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImJ5dGVzU2Nhbm5lZCIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSBiZWVuIHNjYW5uZWQiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgdG8gYmUgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVuZCIsCiAgICAiZG9jIjogIlNlbnQgYXMgdGhlIGZpbmFsIG1lc3NhZ2Ugb2YgdGhlIHJlc3BvbnNlLCBpbmRpY2F0aW5nIHRoYXQgYWxsIHJlc3VsdHMgaGF2ZSBiZWVuIHNlbnQuIiwKICAgICJmaWVsZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfQpdCgCNBJzyQY7ATI6CP3q/u+xnAjwAODAsbWRpZmp0NTUuZWEzLG1kaWZqdDU1LmVhMwqNBJzyQY7ATI6CP3q/u+xnAg4Ewu4EruMJjQSc8kGOwEyOgj96v7vsZwIIBq7jCY0EnPJBjsBMjoI/er+77Gc=",
+      "x-ms-client-request-id" : "86bbabe8-592a-4ba8-a947-da8e2d28cb44",
+      "Content-Type" : "avro/binary"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/0552dd5300552dd53f1815453da38e28aaeb04c77914/0552dd5310552dd53f1875385a60d53559cbf4589a0c?comp=query",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5cc1bb19-1442-4ba9-8b6b-ef48d030a25e",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Wed, 02 Jun 2021 17:20:16 GMT",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-creation-time" : "Wed, 02 Jun 2021 17:20:15 GMT",
+      "eTag" : "0x8D925EAB023AE92",
+      "x-ms-request-id" : "411db1ca-601e-0003-2ed3-57cc08000000",
+      "Body" : "T2JqAQIWYXZyby5zY2hlbWHOHlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLnJlc3VsdERhdGEiLAogICAgImRvYyI6ICJIb2xkcyByZXN1bHQgZGF0YSBpbiB0aGUgZm9ybWF0IHNwZWNpZmllZCBmb3IgdGhpcyBxdWVyeSAoQ1NWLCBKU09OLCBldGMuKS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImRhdGEiLAogICAgICAgICJ0eXBlIjogImJ5dGVzIgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVycm9yIiwKICAgICJkb2MiOiAiQW4gZXJyb3IgdGhhdCBvY2N1cnJlZCB3aGlsZSBwcm9jZXNzaW5nIHRoZSBxdWVyeS4iLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImZhdGFsIiwKICAgICAgICAidHlwZSI6ICJib29sZWFuIiwKICAgICAgICAiZG9jIjogIklmIHRydWUsIHRoaXMgZXJyb3IgcHJldmVudHMgZnVydGhlciBxdWVyeSBwcm9jZXNzaW5nLiAgTW9yZSByZXN1bHQgZGF0YSBtYXkgYmUgcmV0dXJuZWQsIGJ1dCB0aGVyZSBpcyBubyBndWFyYW50ZWUgdGhhdCBhbGwgb2YgdGhlIG9yaWdpbmFsIGRhdGEgd2lsbCBiZSBwcm9jZXNzZWQuICBJZiBmYWxzZSwgdGhpcyBlcnJvciBkb2VzIG5vdCBwcmV2ZW50IGZ1cnRoZXIgcXVlcnkgcHJvY2Vzc2luZy4iCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJuYW1lIiwKICAgICAgICAidHlwZSI6ICJzdHJpbmciLAogICAgICAgICJkb2MiOiAiVGhlIG5hbWUgb2YgdGhlIGVycm9yIgogICAgICB9LAogICAgICB7CiAgICAgICAgIm5hbWUiOiAiZGVzY3JpcHRpb24iLAogICAgICAgICJ0eXBlIjogInN0cmluZyIsCiAgICAgICAgImRvYyI6ICJBIGRlc2NyaXB0aW9uIG9mIHRoZSBlcnJvciIKICAgICAgfSwKICAgICAgewogICAgICAgICJuYW1lIjogInBvc2l0aW9uIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSByZWNvcmQgb2Zmc2V0IGluIHRoZSBibG9iIGF0IHdoaWNoIHRoZSBlcnJvciBvY2N1cnJlZCIKICAgICAgfQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAgICJuYW1lIjogImNvbS5taWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5wcm9ncmVzcyIsCiAgICAiZG9jIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBwcm9ncmVzcyBvZiB0aGUgcXVlcnkiLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImJ5dGVzU2Nhbm5lZCIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSBiZWVuIHNjYW5uZWQiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgdG8gYmUgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVuZCIsCiAgICAiZG9jIjogIlNlbnQgYXMgdGhlIGZpbmFsIG1lc3NhZ2Ugb2YgdGhlIHJlc3BvbnNlLCBpbmRpY2F0aW5nIHRoYXQgYWxsIHJlc3VsdHMgaGF2ZSBiZWVuIHNlbnQuIiwKICAgICJmaWVsZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgc2Nhbm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfQpdCgDeM2yr7288T4x7C6FAmRvxAjwAODAsbWRpZmp0NTUuZWEzLG1kaWZqdDU1LmVhMwreM2yr7288T4x7C6FAmRvxAg4Ewu4EruMJ3jNsq+9vPE+MewuhQJkb8QIIBq7jCd4zbKvvbzxPjHsLoUCZG/E=",
+      "x-ms-client-request-id" : "5cc1bb19-1442-4ba9-8b6b-ef48d030a25e",
+      "Content-Type" : "avro/binary"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "0552dd5300552dd53f1815453da38e28aaeb04c77914", "0552dd5310552dd53f1875385a60d53559cbf4589a0c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryParquetOutputIA.json b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryParquetOutputIA.json
new file mode 100644
index 000000000000..12e2e568cfd0
--- /dev/null
+++ b/sdk/storage/azure-storage-file-datalake/src/test/resources/session-records/FileAPITestQueryParquetOutputIA.json
@@ -0,0 +1,47 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.preprod.core.windows.net/cc6a6a5f0cc6a6a5f9822127170a77059f1094174a08?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-08-04",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "df7766dc-f6f9-4b15-ac19-4a9fd89ad051"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-08-04",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EABEB91657",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:40 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "a876e5f3-d01e-0011-11d3-57f814000000",
+      "x-ms-client-request-id" : "df7766dc-f6f9-4b15-ac19-4a9fd89ad051",
+      "Date" : "Wed, 02 Jun 2021 17:20:39 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.dfs.preprod.core.windows.net/cc6a6a5f0cc6a6a5f9822127170a77059f1094174a08/cc6a6a5f1cc6a6a5f9828975162aad6e755064580b84?resource=file",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-datalake/12.6.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "906eab91-c8b4-42fa-944a-2e689bd59b2f"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D925EABF1BE8F0",
+      "Last-Modified" : "Wed, 02 Jun 2021 17:20:40 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-request-id" : "3a459b71-e01f-0012-01d3-57fb13000000",
+      "x-ms-client-request-id" : "906eab91-c8b4-42fa-944a-2e689bd59b2f",
+      "Date" : "Wed, 02 Jun 2021 17:20:40 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "cc6a6a5f0cc6a6a5f9822127170a77059f1094174a08", "cc6a6a5f1cc6a6a5f9828975162aad6e755064580b84" ]
+}
\ No newline at end of file

From cf6093a9241c5261a16bcf18aeee339e9dda7a38 Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Thu, 17 Jun 2021 10:41:32 -0700
Subject: [PATCH 4/9] Implemented Immutable Storage with Versioning (#21718)

---
 .../azure/storage/blob/BlobAsyncClient.java   |  21 +-
 .../blob/BlobContainerAsyncClient.java        |   2 +-
 .../blob/BlobServiceClientBuilder.java        |  25 +-
 .../blob/implementation/AppendBlobsImpl.java  |   7 +-
 .../blob/implementation/BlobsImpl.java        |  54 +-
 .../blob/implementation/BlockBlobsImpl.java   |  12 +-
 .../blob/implementation/PageBlobsImpl.java    |   7 +-
 .../models/ArrowConfiguration.java            |   2 +-
 .../implementation/models/ArrowField.java     |   2 +-
 .../models/BlobItemInternal.java              |  26 +
 .../models/BlobItemPropertiesInternal.java    |   1 +
 .../models/BlobsGetPropertiesHeaders.java     |   1 +
 .../BlobsSetImmutabilityPolicyHeaders.java    |   1 +
 .../models/DelimitedTextConfiguration.java    |  48 +-
 .../models/JsonTextConfiguration.java         |   8 +-
 .../implementation/models/QueryFormat.java    |  18 +-
 .../implementation/models/QueryRequest.java   |  15 +-
 .../blob/implementation/util/ModelHelper.java |  14 +
 .../models/BlobContainerItemProperties.java   |   2 +-
 .../blob/models/BlobContainerProperties.java  |  36 +
 .../blob/models/BlobDownloadHeaders.java      |  79 ++
 .../blob/models/BlobImmutabilityPolicy.java   |  47 ++
 .../models/BlobImmutabilityPolicyMode.java    |  10 +-
 .../blob/models/BlobItemProperties.java       |  77 ++
 .../blob/models/BlobLegalHoldResult.java      |  27 +
 .../storage/blob/models/BlobListDetails.java  |  48 ++
 .../storage/blob/models/BlobProperties.java   |  93 +++
 .../blob/models/ListBlobsIncludeItem.java     |   5 +-
 .../blob/options/AppendBlobCreateOptions.java |  39 +
 .../blob/options/BlobBeginCopyOptions.java    |  39 +
 .../blob/options/BlobCopyFromUrlOptions.java  |  39 +
 .../options/BlobParallelUploadOptions.java    |  39 +
 .../BlockBlobCommitBlockListOptions.java      |  39 +
 .../options/BlockBlobSimpleUploadOptions.java |  39 +
 .../blob/options/PageBlobCreateOptions.java   |  39 +
 .../blob/sas/BlobContainerSasPermission.java  |  30 +-
 .../storage/blob/sas/BlobSasPermission.java   |  30 +-
 .../specialized/AppendBlobAsyncClient.java    |   8 +-
 .../blob/specialized/BlobAsyncClientBase.java | 196 ++++-
 .../blob/specialized/BlobClientBase.java      | 116 +++
 .../specialized/BlockBlobAsyncClient.java     |  15 +-
 .../blob/specialized/PageBlobAsyncClient.java |  10 +-
 ...lobAsyncClientBaseJavaDocCodeSnippets.java |  58 ++
 .../BlobClientBaseJavaDocCodeSnippets.java    |  59 ++
 .../com/azure/storage/blob/APISpec.groovy     |   2 +-
 .../blob/BlobServiceSasModelsTest.groovy      | 108 +--
 .../com/azure/storage/blob/CPKNTest.groovy    |   4 +-
 .../com/azure/storage/blob/CPKTest.groovy     |   5 +-
 .../ImmutableStorageWithVersioningTest.groovy | 683 ++++++++++++++++++
 ...leStorageWithVersioningTestAccountSas.json |  92 +++
 ...ageWithVersioningTestAppendBlobCreate.json | 108 +++
 ...tableStorageWithVersioningTestBlobSas.json |  92 +++
 ...ersioningTestBlockBlobCommitBlockList.json | 112 +++
 ...rageWithVersioningTestBlockBlobUpload.json | 114 +++
 ...WithVersioningTestContainerProperties.json | 100 +++
 ...StorageWithVersioningTestContainerSas.json |  92 +++
 ...mmutableStorageWithVersioningTestCopy.json | 159 ++++
 ...ersioningTestDeleteImmutabilityPolicy.json | 125 ++++
 ...ningTestDeleteImmutabilityPolicyError.json |  73 ++
 ...ioningTestDeleteImmutabilityPolicyMin.json | 125 ++++
 ...orageWithVersioningTestPageBlobCreate.json | 108 +++
 ...ioningTestSetImmutabilityPolicyACFail.json |  73 ++
 ...sioningTestSetImmutabilityPolicyAC[0].json |  72 ++
 ...sioningTestSetImmutabilityPolicyAC[1].json |  72 ++
 ...sioningTestSetImmutabilityPolicyError.json |  73 ++
 ...VersioningTestSetImmutabilityPolicyIA.json |  51 ++
 ...ersioningTestSetImmutabilityPolicyMin.json |  72 ++
 ...ersioningTestSetImmutabilityPolicy[0].json | 129 ++++
 ...geWithVersioningTestSetLegalHoldError.json |  73 ++
 ...eWithVersioningTestSetLegalHoldMin[0].json |  71 ++
 ...eWithVersioningTestSetLegalHoldMin[1].json |  71 ++
 ...rageWithVersioningTestSetLegalHold[0].json | 127 ++++
 ...rageWithVersioningTestSetLegalHold[1].json | 127 ++++
 ...ableStorageWithVersioningTestSyncCopy.json | 162 +++++
 .../azure-storage-blob/swagger/README.md      |  36 +-
 .../BlobStorageCustomization.java             |   4 +
 sdk/storage/azure-storage-common/CHANGELOG.md |   2 +-
 .../common/sas/AccountSasPermission.java      |  32 +-
 .../implementation/SasModelsTest.groovy       |  58 +-
 79 files changed, 4713 insertions(+), 177 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicy.java
 rename sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/{implementation => }/models/BlobImmutabilityPolicyMode.java (93%)
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
 create mode 100644 sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAccountSas.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAppendBlobCreate.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlobSas.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobCommitBlockList.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobUpload.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerProperties.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerSas.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestCopy.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicy.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyError.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyMin.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestPageBlobCreate.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACFail.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[0].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[1].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyError.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyIA.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyMin.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicy[0].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldError.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[0].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[1].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[0].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[1].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSyncCopy.json

diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
index 0eab682c039d..74127d47445a 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobAsyncClient.java
@@ -14,6 +14,7 @@
 import com.azure.storage.blob.implementation.util.ModelHelper;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.BlockBlobItem;
@@ -515,16 +516,19 @@ buffers is not a common scenario for async like it is in sync (and we already bu
             final BlobRequestConditions requestConditions = options.getRequestConditions() == null
                 ? new BlobRequestConditions() : options.getRequestConditions();
             final boolean computeMd5 = options.isComputeMd5();
+            final BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+                ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
+            final Boolean legalHold = options.isLegalHold();
 
             BlockBlobAsyncClient blockBlobAsyncClient = getBlockBlobAsyncClient();
 
             Function<Flux<ByteBuffer>, Mono<Response<BlockBlobItem>>> uploadInChunksFunction = (stream) ->
                 uploadInChunks(blockBlobAsyncClient, stream, parallelTransferOptions, headers, metadata, tags,
-                    tier, requestConditions, computeMd5);
+                    tier, requestConditions, computeMd5, immutabilityPolicy, legalHold);
 
             BiFunction<Flux<ByteBuffer>, Long, Mono<Response<BlockBlobItem>>> uploadFullBlobFunction =
                 (stream, length) -> uploadFullBlob(blockBlobAsyncClient, stream, length, parallelTransferOptions,
-                    headers, metadata, tags, tier, requestConditions, computeMd5);
+                    headers, metadata, tags, tier, requestConditions, computeMd5, immutabilityPolicy, legalHold);
 
             Flux<ByteBuffer> data = options.getDataFlux() == null ? Utility.convertStreamToByteBuffer(
                 options.getDataStream(), options.getLength(),
@@ -541,7 +545,8 @@ buffers is not a common scenario for async like it is in sync (and we already bu
     private Mono<Response<BlockBlobItem>> uploadFullBlob(BlockBlobAsyncClient blockBlobAsyncClient,
         Flux<ByteBuffer> data, long length, ParallelTransferOptions parallelTransferOptions, BlobHttpHeaders headers,
         Map<String, String> metadata, Map<String, String> tags, AccessTier tier,
-        BlobRequestConditions requestConditions, boolean computeMd5) {
+        BlobRequestConditions requestConditions, boolean computeMd5, BlobImmutabilityPolicy immutabilityPolicy,
+        Boolean legalHold) {
 
         /*
         Note that there is no need to buffer here as the flux returned by the size gate in this case is created
@@ -559,14 +564,17 @@ private Mono<Response<BlockBlobItem>> uploadFullBlob(BlockBlobAsyncClient blockB
                 .setTags(tags)
                 .setTier(tier)
                 .setRequestConditions(requestConditions)
-                .setContentMd5(fluxMd5Wrapper.getMd5()))
+                .setContentMd5(fluxMd5Wrapper.getMd5())
+                .setImmutabilityPolicy(immutabilityPolicy)
+                .setLegalHold(legalHold))
             .flatMap(blockBlobAsyncClient::uploadWithResponse);
     }
 
     private Mono<Response<BlockBlobItem>> uploadInChunks(BlockBlobAsyncClient blockBlobAsyncClient,
         Flux<ByteBuffer> data, ParallelTransferOptions parallelTransferOptions, BlobHttpHeaders headers,
         Map<String, String> metadata, Map<String, String> tags, AccessTier tier,
-        BlobRequestConditions requestConditions, boolean computeMd5) {
+        BlobRequestConditions requestConditions, boolean computeMd5, BlobImmutabilityPolicy immutabilityPolicy,
+        Boolean legalHold) {
         // TODO: Sample/api reference
         // See ProgressReporter for an explanation on why this lock is necessary and why we use AtomicLong.
         AtomicLong totalProgress = new AtomicLong();
@@ -609,7 +617,8 @@ private Mono<Response<BlockBlobItem>> uploadInChunks(BlockBlobAsyncClient blockB
             .flatMap(ids ->
                 blockBlobAsyncClient.commitBlockListWithResponse(new BlockBlobCommitBlockListOptions(ids)
                     .setHeaders(headers).setMetadata(metadata).setTags(tags).setTier(tier)
-                        .setRequestConditions(requestConditions)));
+                    .setRequestConditions(requestConditions).setImmutabilityPolicy(immutabilityPolicy)
+                    .setLegalHold(legalHold)));
     }
 
     /**
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java
index 51be77a1aad5..99e495de8aea 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java
@@ -505,7 +505,7 @@ Mono<Response<BlobContainerProperties>> getPropertiesWithResponse(String leaseId
                     hd.getLastModified(), hd.getXMsLeaseDuration(), hd.getXMsLeaseState(), hd.getXMsLeaseStatus(),
                     hd.getXMsBlobPublicAccess(), Boolean.TRUE.equals(hd.isXMsHasImmutabilityPolicy()),
                     Boolean.TRUE.equals(hd.isXMsHasLegalHold()), hd.getXMsDefaultEncryptionScope(),
-                    hd.isXMsDenyEncryptionScopeOverride());
+                    hd.isXMsDenyEncryptionScopeOverride(), hd.isXMsImmutableStorageWithVersioningEnabled());
                 return new SimpleResponse<>(rb, properties);
             });
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceClientBuilder.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceClientBuilder.java
index e506f577b69d..386b7af2e9d6 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceClientBuilder.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceClientBuilder.java
@@ -9,6 +9,8 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelinePosition;
+import com.azure.core.http.policy.AzureSasCredentialPolicy;
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.util.ClientOptions;
@@ -25,6 +27,7 @@
 import com.azure.storage.common.implementation.connectionstring.StorageConnectionString;
 import com.azure.storage.common.implementation.connectionstring.StorageEndpoint;
 import com.azure.storage.common.policy.RequestRetryOptions;
+import com.azure.storage.common.policy.StorageSharedKeyCredentialPolicy;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -100,11 +103,6 @@ public BlobServiceAsyncClient buildAsyncClient() {
 
         boolean anonymousAccess = false;
 
-        if (Objects.isNull(storageSharedKeyCredential) && Objects.isNull(tokenCredential)
-            && Objects.isNull(azureSasCredential) && Objects.isNull(sasToken)) {
-            anonymousAccess = true;
-        }
-
         if (Objects.nonNull(customerProvidedKey) && Objects.nonNull(encryptionScope)) {
             throw logger.logExceptionAsError(new IllegalArgumentException("Customer provided key and encryption "
                 + "scope cannot both be set"));
@@ -116,6 +114,23 @@ public BlobServiceAsyncClient buildAsyncClient() {
             endpoint, retryOptions, logOptions,
             clientOptions, httpClient, perCallPolicies, perRetryPolicies, configuration, logger);
 
+        boolean foundCredential = false;
+        for (int i = 0; i < pipeline.getPolicyCount(); i++) {
+            if (pipeline.getPolicy(i) instanceof StorageSharedKeyCredentialPolicy) {
+                foundCredential = true;
+                break;
+            }
+            if (pipeline.getPolicy(i) instanceof BearerTokenAuthenticationPolicy) {
+                foundCredential = true;
+                break;
+            }
+            if (pipeline.getPolicy(i) instanceof AzureSasCredentialPolicy) {
+                foundCredential = true;
+                break;
+            }
+        }
+        anonymousAccess = !foundCredential;
+
         return new BlobServiceAsyncClient(pipeline, endpoint, serviceVersion, accountName, customerProvidedKey,
             encryptionScope, blobContainerEncryptionScope, anonymousAccess);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
index 0f5b9bea4d58..cecf00942c8f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/AppendBlobsImpl.java
@@ -24,10 +24,10 @@
 import com.azure.storage.blob.implementation.models.AppendBlobsAppendBlockResponse;
 import com.azure.storage.blob.implementation.models.AppendBlobsCreateResponse;
 import com.azure.storage.blob.implementation.models.AppendBlobsSealResponse;
-import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.implementation.models.StorageErrorException;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.CpkInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import java.net.URL;
@@ -162,6 +162,7 @@ Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrl(
                 @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("x-ms-copy-source-authorization") String copySourceAuthorization,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -497,6 +498,8 @@ public Mono<AppendBlobsAppendBlockResponse> appendBlockWithResponseAsync(
      * @param sourceIfNoneMatch Specify an ETag value to operate only on blobs without a matching value.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
+     * @param copySourceAuthorization Only Bearer type is supported. Credentials should be a valid OAuth access token to
+     *     copy source.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
      * @param context The context to associate with this operation.
@@ -529,6 +532,7 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRespons
             String sourceIfMatch,
             String sourceIfNoneMatch,
             String requestId,
+            String copySourceAuthorization,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
             Context context) {
@@ -595,6 +599,7 @@ public Mono<AppendBlobsAppendBlockFromUrlResponse> appendBlockFromUrlWithRespons
                 sourceIfNoneMatch,
                 this.client.getVersion(),
                 requestId,
+                copySourceAuthorization,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
index 23133e3b561c..8aa992bf243b 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java
@@ -28,7 +28,6 @@
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.storage.blob.implementation.models.BlobDeleteType;
 import com.azure.storage.blob.implementation.models.BlobExpiryOptions;
-import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.BlobTags;
 import com.azure.storage.blob.implementation.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.implementation.models.BlobsAcquireLeaseResponse;
@@ -62,6 +61,7 @@
 import com.azure.storage.blob.implementation.models.StorageErrorException;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.CpkInfo;
 import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
@@ -302,10 +302,12 @@ Mono<BlobsSetHttpHeadersResponse> setHttpHeaders(
 
         @Put("/{containerName}/{blob}")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        @UnexpectedResponseExceptionType(com.azure.storage.blob.models.BlobStorageException.class)
         Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicy(
                 @HostParam("url") String url,
                 @QueryParam("comp") String comp,
+                @PathParam("containerName") String containerName,
+                @PathParam("blob") String blob,
                 @QueryParam("timeout") Integer timeout,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
@@ -317,10 +319,12 @@ Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicy(
 
         @Delete("/{containerName}/{blob}")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        @UnexpectedResponseExceptionType(com.azure.storage.blob.models.BlobStorageException.class)
         Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicy(
                 @HostParam("url") String url,
                 @QueryParam("comp") String comp,
+                @PathParam("containerName") String containerName,
+                @PathParam("blob") String blob,
                 @QueryParam("timeout") Integer timeout,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
@@ -329,10 +333,12 @@ Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicy(
 
         @Put("/{containerName}/{blob}")
         @ExpectedResponses({200})
-        @UnexpectedResponseExceptionType(StorageErrorException.class)
+        @UnexpectedResponseExceptionType(com.azure.storage.blob.models.BlobStorageException.class)
         Mono<BlobsSetLegalHoldResponse> setLegalHold(
                 @HostParam("url") String url,
                 @QueryParam("comp") String comp,
+                @PathParam("containerName") String containerName,
+                @PathParam("blob") String blob,
                 @QueryParam("timeout") Integer timeout,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
@@ -561,6 +567,7 @@ Mono<BlobsCopyFromURLResponse> copyFromURL(
                 @HeaderParam("x-ms-immutability-policy-until-date") DateTimeRfc1123 immutabilityPolicyExpiry,
                 @HeaderParam("x-ms-immutability-policy-mode") BlobImmutabilityPolicyMode immutabilityPolicyMode,
                 @HeaderParam("x-ms-legal-hold") Boolean legalHold,
+                @HeaderParam("x-ms-copy-source-authorization") String copySourceAuthorization,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -1395,6 +1402,8 @@ public Mono<BlobsSetHttpHeadersResponse> setHttpHeadersWithResponseAsync(
     /**
      * The Set Immutability Policy operation sets the immutability policy on the blob.
      *
+     * @param containerName The container name.
+     * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
      *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
      *     Timeouts for Blob Service Operations.&lt;/a&gt;.
@@ -1412,6 +1421,8 @@ public Mono<BlobsSetHttpHeadersResponse> setHttpHeadersWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicyWithResponseAsync(
+            String containerName,
+            String blob,
             Integer timeout,
             String requestId,
             OffsetDateTime ifUnmodifiedSince,
@@ -1427,6 +1438,8 @@ public Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicyWithRespons
         return service.setImmutabilityPolicy(
                 this.client.getUrl(),
                 comp,
+                containerName,
+                blob,
                 timeout,
                 this.client.getVersion(),
                 requestId,
@@ -1440,6 +1453,8 @@ public Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicyWithRespons
     /**
      * The Delete Immutability Policy operation deletes the immutability policy on the blob.
      *
+     * @param containerName The container name.
+     * @param blob The blob name.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
      *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
      *     Timeouts for Blob Service Operations.&lt;/a&gt;.
@@ -1453,16 +1468,26 @@ public Mono<BlobsSetImmutabilityPolicyResponse> setImmutabilityPolicyWithRespons
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicyWithResponseAsync(
-            Integer timeout, String requestId, Context context) {
+            String containerName, String blob, Integer timeout, String requestId, Context context) {
         final String comp = "immutabilityPolicies";
         final String accept = "application/xml";
         return service.deleteImmutabilityPolicy(
-                this.client.getUrl(), comp, timeout, this.client.getVersion(), requestId, accept, context);
+                this.client.getUrl(),
+                comp,
+                containerName,
+                blob,
+                timeout,
+                this.client.getVersion(),
+                requestId,
+                accept,
+                context);
     }
 
     /**
      * The Set Legal Hold operation sets a legal hold on the blob.
      *
+     * @param containerName The container name.
+     * @param blob The blob name.
      * @param legalHold Specified if a legal hold should be set on the blob.
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
      *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
@@ -1477,11 +1502,20 @@ public Mono<BlobsDeleteImmutabilityPolicyResponse> deleteImmutabilityPolicyWithR
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<BlobsSetLegalHoldResponse> setLegalHoldWithResponseAsync(
-            boolean legalHold, Integer timeout, String requestId, Context context) {
+            String containerName, String blob, boolean legalHold, Integer timeout, String requestId, Context context) {
         final String comp = "legalhold";
         final String accept = "application/xml";
         return service.setLegalHold(
-                this.client.getUrl(), comp, timeout, this.client.getVersion(), requestId, legalHold, accept, context);
+                this.client.getUrl(),
+                comp,
+                containerName,
+                blob,
+                timeout,
+                this.client.getVersion(),
+                requestId,
+                legalHold,
+                accept,
+                context);
     }
 
     /**
@@ -2167,6 +2201,8 @@ public Mono<BlobsStartCopyFromURLResponse> startCopyFromURLWithResponseAsync(
      * @param immutabilityPolicyExpiry Specifies the date time when the blobs immutability policy is set to expire.
      * @param immutabilityPolicyMode Specifies the immutability policy mode to set on the blob.
      * @param legalHold Specified if a legal hold should be set on the blob.
+     * @param copySourceAuthorization Only Bearer type is supported. Credentials should be a valid OAuth access token to
+     *     copy source.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws StorageErrorException thrown if the request is rejected by server.
@@ -2197,6 +2233,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithResponseAsync(
             OffsetDateTime immutabilityPolicyExpiry,
             BlobImmutabilityPolicyMode immutabilityPolicyMode,
             Boolean legalHold,
+            String copySourceAuthorization,
             Context context) {
         final String xMsRequiresSync = "true";
         final String accept = "application/xml";
@@ -2237,6 +2274,7 @@ public Mono<BlobsCopyFromURLResponse> copyFromURLWithResponseAsync(
                 immutabilityPolicyExpiryConverted,
                 immutabilityPolicyMode,
                 legalHold,
+                copySourceAuthorization,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
index 9770b1489f9f..87bb9c108eba 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlockBlobsImpl.java
@@ -21,7 +21,6 @@
 import com.azure.core.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.core.util.DateTimeRfc1123;
-import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.BlockBlobsCommitBlockListResponse;
 import com.azure.storage.blob.implementation.models.BlockBlobsGetBlockListResponse;
 import com.azure.storage.blob.implementation.models.BlockBlobsPutBlobFromUrlResponse;
@@ -32,6 +31,7 @@
 import com.azure.storage.blob.implementation.models.StorageErrorException;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.BlockListType;
 import com.azure.storage.blob.models.BlockLookupList;
 import com.azure.storage.blob.models.CpkInfo;
@@ -148,6 +148,7 @@ Mono<BlockBlobsPutBlobFromUrlResponse> putBlobFromUrl(
                 @HeaderParam("x-ms-tags") String blobTagsString,
                 @HeaderParam("x-ms-copy-source") URL copySource,
                 @HeaderParam("x-ms-copy-source-blob-properties") Boolean copySourceBlobProperties,
+                @HeaderParam("x-ms-copy-source-authorization") String copySourceAuthorization,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -201,6 +202,7 @@ Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURL(
                 @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("x-ms-copy-source-authorization") String copySourceAuthorization,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -473,6 +475,8 @@ public Mono<BlockBlobsUploadResponse> uploadWithResponseAsync(
      * @param blobTagsString Optional. Used to set blob tags in various blob operations.
      * @param copySourceBlobProperties Optional, default is true. Indicates if properties from the source blob should be
      *     copied.
+     * @param copySourceAuthorization Only Bearer type is supported. Credentials should be a valid OAuth access token to
+     *     copy source.
      * @param blobHttpHeaders Parameter group.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
@@ -507,6 +511,7 @@ public Mono<BlockBlobsPutBlobFromUrlResponse> putBlobFromUrlWithResponseAsync(
             byte[] sourceContentMD5,
             String blobTagsString,
             Boolean copySourceBlobProperties,
+            String copySourceAuthorization,
             BlobHttpHeaders blobHttpHeaders,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
@@ -611,6 +616,7 @@ public Mono<BlockBlobsPutBlobFromUrlResponse> putBlobFromUrlWithResponseAsync(
                 blobTagsString,
                 copySource,
                 copySourceBlobProperties,
+                copySourceAuthorization,
                 accept,
                 context);
     }
@@ -729,6 +735,8 @@ public Mono<BlockBlobsStageBlockResponse> stageBlockWithResponseAsync(
      * @param sourceIfNoneMatch Specify an ETag value to operate only on blobs without a matching value.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
+     * @param copySourceAuthorization Only Bearer type is supported. Credentials should be a valid OAuth access token to
+     *     copy source.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
      * @param context The context to associate with this operation.
@@ -754,6 +762,7 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithResponseAs
             String sourceIfMatch,
             String sourceIfNoneMatch,
             String requestId,
+            String copySourceAuthorization,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
             Context context) {
@@ -808,6 +817,7 @@ public Mono<BlockBlobsStageBlockFromURLResponse> stageBlockFromURLWithResponseAs
                 sourceIfNoneMatch,
                 this.client.getVersion(),
                 requestId,
+                copySourceAuthorization,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
index 88dd509959c1..89720d3a2ffc 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/PageBlobsImpl.java
@@ -21,7 +21,6 @@
 import com.azure.core.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.core.util.DateTimeRfc1123;
-import com.azure.storage.blob.implementation.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.implementation.models.PageBlobsClearPagesResponse;
 import com.azure.storage.blob.implementation.models.PageBlobsCopyIncrementalResponse;
@@ -35,6 +34,7 @@
 import com.azure.storage.blob.implementation.models.PremiumPageBlobAccessTier;
 import com.azure.storage.blob.implementation.models.StorageErrorException;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.CpkInfo;
 import com.azure.storage.blob.models.EncryptionAlgorithmType;
 import com.azure.storage.blob.models.SequenceNumberActionType;
@@ -208,6 +208,7 @@ Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURL(
                 @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch,
                 @HeaderParam("x-ms-version") String version,
                 @HeaderParam("x-ms-client-request-id") String requestId,
+                @HeaderParam("x-ms-copy-source-authorization") String copySourceAuthorization,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -757,6 +758,8 @@ public Mono<PageBlobsClearPagesResponse> clearPagesWithResponseAsync(
      * @param sourceIfNoneMatch Specify an ETag value to operate only on blobs without a matching value.
      * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
      *     analytics logs when storage analytics logging is enabled.
+     * @param copySourceAuthorization Only Bearer type is supported. Credentials should be a valid OAuth access token to
+     *     copy source.
      * @param cpkInfo Parameter group.
      * @param encryptionScope Parameter group.
      * @param context The context to associate with this operation.
@@ -790,6 +793,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithResponseA
             String sourceIfMatch,
             String sourceIfNoneMatch,
             String requestId,
+            String copySourceAuthorization,
             CpkInfo cpkInfo,
             EncryptionScope encryptionScope,
             Context context) {
@@ -858,6 +862,7 @@ public Mono<PageBlobsUploadPagesFromURLResponse> uploadPagesFromURLWithResponseA
                 sourceIfNoneMatch,
                 this.client.getVersion(),
                 requestId,
+                copySourceAuthorization,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowConfiguration.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowConfiguration.java
index 31dc9df2689e..887b18437081 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowConfiguration.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowConfiguration.java
@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/** arrow configuration. */
+/** Groups the settings used for formatting the response if the response should be Arrow formatted. */
 @JacksonXmlRootElement(localName = "ArrowConfiguration")
 @Fluent
 public final class ArrowConfiguration {
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowField.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowField.java
index d64199574ed8..eebe8075c040 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowField.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ArrowField.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-/** field of an arrow schema. */
+/** Groups settings regarding specific field of an arrow schema. */
 @JacksonXmlRootElement(localName = "Field")
 @Fluent
 public final class ArrowField {
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemInternal.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemInternal.java
index 3aeb32ebad74..223e34a14e65 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemInternal.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemInternal.java
@@ -67,6 +67,12 @@ public final class BlobItemInternal {
     @JsonProperty(value = "OrMetadata")
     private Map<String, String> objectReplicationMetadata;
 
+    /*
+     * The HasVersionsOnly property.
+     */
+    @JsonProperty(value = "HasVersionsOnly")
+    private Boolean hasVersionsOnly;
+
     /*
      * The IsPrefix property.
      */
@@ -253,6 +259,26 @@ public BlobItemInternal setObjectReplicationMetadata(Map<String, String> objectR
         return this;
     }
 
+    /**
+     * Get the hasVersionsOnly property: The HasVersionsOnly property.
+     *
+     * @return the hasVersionsOnly value.
+     */
+    public Boolean isHasVersionsOnly() {
+        return this.hasVersionsOnly;
+    }
+
+    /**
+     * Set the hasVersionsOnly property: The HasVersionsOnly property.
+     *
+     * @param hasVersionsOnly the hasVersionsOnly value to set.
+     * @return the BlobItemInternal object itself.
+     */
+    public BlobItemInternal setHasVersionsOnly(Boolean hasVersionsOnly) {
+        this.hasVersionsOnly = hasVersionsOnly;
+        return this;
+    }
+
     /**
      * Get the isPrefix property: The IsPrefix property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
index 446e4a682d1a..443916a33dc4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobItemPropertiesInternal.java
@@ -9,6 +9,7 @@
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.ArchiveStatus;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.BlobType;
 import com.azure.storage.blob.models.CopyStatusType;
 import com.azure.storage.blob.models.LeaseDurationType;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
index 671d3c8a9e5a..b86ca93fb023 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsGetPropertiesHeaders.java
@@ -8,6 +8,7 @@
 import com.azure.core.annotation.HeaderCollection;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.BlobType;
 import com.azure.storage.blob.models.CopyStatusType;
 import com.azure.storage.blob.models.LeaseDurationType;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
index 74eb4099d88f..2b7553f45126 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsSetImmutabilityPolicyHeaders.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import java.time.OffsetDateTime;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/DelimitedTextConfiguration.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/DelimitedTextConfiguration.java
index 37da273fa7c3..a0b4209499a0 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/DelimitedTextConfiguration.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/DelimitedTextConfiguration.java
@@ -8,42 +8,42 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-/** delimited text configuration. */
+/** Groups the settings used for interpreting the blob data if the blob is delimited text formatted. */
 @JacksonXmlRootElement(localName = "DelimitedTextConfiguration")
 @Fluent
 public final class DelimitedTextConfiguration {
     /*
-     * column separator
+     * The string used to separate columns.
      */
-    @JsonProperty(value = "ColumnSeparator", required = true)
+    @JsonProperty(value = "ColumnSeparator")
     private String columnSeparator;
 
     /*
-     * field quote
+     * The string used to quote a specific field.
      */
-    @JsonProperty(value = "FieldQuote", required = true)
+    @JsonProperty(value = "FieldQuote")
     private String fieldQuote;
 
     /*
-     * record separator
+     * The string used to separate records.
      */
-    @JsonProperty(value = "RecordSeparator", required = true)
+    @JsonProperty(value = "RecordSeparator")
     private String recordSeparator;
 
     /*
-     * escape char
+     * The string used as an escape character.
      */
-    @JsonProperty(value = "EscapeChar", required = true)
+    @JsonProperty(value = "EscapeChar")
     private String escapeChar;
 
     /*
-     * has headers
+     * Represents whether the data has headers.
      */
-    @JsonProperty(value = "HasHeaders", required = true)
-    private boolean headersPresent;
+    @JsonProperty(value = "HasHeaders")
+    private Boolean headersPresent;
 
     /**
-     * Get the columnSeparator property: column separator.
+     * Get the columnSeparator property: The string used to separate columns.
      *
      * @return the columnSeparator value.
      */
@@ -52,7 +52,7 @@ public String getColumnSeparator() {
     }
 
     /**
-     * Set the columnSeparator property: column separator.
+     * Set the columnSeparator property: The string used to separate columns.
      *
      * @param columnSeparator the columnSeparator value to set.
      * @return the DelimitedTextConfiguration object itself.
@@ -63,7 +63,7 @@ public DelimitedTextConfiguration setColumnSeparator(String columnSeparator) {
     }
 
     /**
-     * Get the fieldQuote property: field quote.
+     * Get the fieldQuote property: The string used to quote a specific field.
      *
      * @return the fieldQuote value.
      */
@@ -72,7 +72,7 @@ public String getFieldQuote() {
     }
 
     /**
-     * Set the fieldQuote property: field quote.
+     * Set the fieldQuote property: The string used to quote a specific field.
      *
      * @param fieldQuote the fieldQuote value to set.
      * @return the DelimitedTextConfiguration object itself.
@@ -83,7 +83,7 @@ public DelimitedTextConfiguration setFieldQuote(String fieldQuote) {
     }
 
     /**
-     * Get the recordSeparator property: record separator.
+     * Get the recordSeparator property: The string used to separate records.
      *
      * @return the recordSeparator value.
      */
@@ -92,7 +92,7 @@ public String getRecordSeparator() {
     }
 
     /**
-     * Set the recordSeparator property: record separator.
+     * Set the recordSeparator property: The string used to separate records.
      *
      * @param recordSeparator the recordSeparator value to set.
      * @return the DelimitedTextConfiguration object itself.
@@ -103,7 +103,7 @@ public DelimitedTextConfiguration setRecordSeparator(String recordSeparator) {
     }
 
     /**
-     * Get the escapeChar property: escape char.
+     * Get the escapeChar property: The string used as an escape character.
      *
      * @return the escapeChar value.
      */
@@ -112,7 +112,7 @@ public String getEscapeChar() {
     }
 
     /**
-     * Set the escapeChar property: escape char.
+     * Set the escapeChar property: The string used as an escape character.
      *
      * @param escapeChar the escapeChar value to set.
      * @return the DelimitedTextConfiguration object itself.
@@ -123,21 +123,21 @@ public DelimitedTextConfiguration setEscapeChar(String escapeChar) {
     }
 
     /**
-     * Get the headersPresent property: has headers.
+     * Get the headersPresent property: Represents whether the data has headers.
      *
      * @return the headersPresent value.
      */
-    public boolean isHeadersPresent() {
+    public Boolean isHeadersPresent() {
         return this.headersPresent;
     }
 
     /**
-     * Set the headersPresent property: has headers.
+     * Set the headersPresent property: Represents whether the data has headers.
      *
      * @param headersPresent the headersPresent value to set.
      * @return the DelimitedTextConfiguration object itself.
      */
-    public DelimitedTextConfiguration setHeadersPresent(boolean headersPresent) {
+    public DelimitedTextConfiguration setHeadersPresent(Boolean headersPresent) {
         this.headersPresent = headersPresent;
         return this;
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/JsonTextConfiguration.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/JsonTextConfiguration.java
index 9bf067a122de..63e827253c19 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/JsonTextConfiguration.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/JsonTextConfiguration.java
@@ -13,13 +13,13 @@
 @Fluent
 public final class JsonTextConfiguration {
     /*
-     * record separator
+     * The string used to separate records.
      */
-    @JsonProperty(value = "RecordSeparator", required = true)
+    @JsonProperty(value = "RecordSeparator")
     private String recordSeparator;
 
     /**
-     * Get the recordSeparator property: record separator.
+     * Get the recordSeparator property: The string used to separate records.
      *
      * @return the recordSeparator value.
      */
@@ -28,7 +28,7 @@ public String getRecordSeparator() {
     }
 
     /**
-     * Set the recordSeparator property: record separator.
+     * Set the recordSeparator property: The string used to separate records.
      *
      * @param recordSeparator the recordSeparator value to set.
      * @return the JsonTextConfiguration object itself.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryFormat.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryFormat.java
index 5318374672fd..76008b0d81c3 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryFormat.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryFormat.java
@@ -19,7 +19,8 @@ public final class QueryFormat {
     private QueryFormatType type;
 
     /*
-     * delimited text configuration
+     * Groups the settings used for interpreting the blob data if the blob is
+     * delimited text formatted.
      */
     @JsonProperty(value = "DelimitedTextConfiguration")
     private DelimitedTextConfiguration delimitedTextConfiguration;
@@ -31,7 +32,8 @@ public final class QueryFormat {
     private JsonTextConfiguration jsonTextConfiguration;
 
     /*
-     * arrow configuration
+     * Groups the settings used for formatting the response if the response
+     * should be Arrow formatted.
      */
     @JsonProperty(value = "ArrowConfiguration")
     private ArrowConfiguration arrowConfiguration;
@@ -63,7 +65,8 @@ public QueryFormat setType(QueryFormatType type) {
     }
 
     /**
-     * Get the delimitedTextConfiguration property: delimited text configuration.
+     * Get the delimitedTextConfiguration property: Groups the settings used for interpreting the blob data if the blob
+     * is delimited text formatted.
      *
      * @return the delimitedTextConfiguration value.
      */
@@ -72,7 +75,8 @@ public DelimitedTextConfiguration getDelimitedTextConfiguration() {
     }
 
     /**
-     * Set the delimitedTextConfiguration property: delimited text configuration.
+     * Set the delimitedTextConfiguration property: Groups the settings used for interpreting the blob data if the blob
+     * is delimited text formatted.
      *
      * @param delimitedTextConfiguration the delimitedTextConfiguration value to set.
      * @return the QueryFormat object itself.
@@ -103,7 +107,8 @@ public QueryFormat setJsonTextConfiguration(JsonTextConfiguration jsonTextConfig
     }
 
     /**
-     * Get the arrowConfiguration property: arrow configuration.
+     * Get the arrowConfiguration property: Groups the settings used for formatting the response if the response should
+     * be Arrow formatted.
      *
      * @return the arrowConfiguration value.
      */
@@ -112,7 +117,8 @@ public ArrowConfiguration getArrowConfiguration() {
     }
 
     /**
-     * Set the arrowConfiguration property: arrow configuration.
+     * Set the arrowConfiguration property: Groups the settings used for formatting the response if the response should
+     * be Arrow formatted.
      *
      * @param arrowConfiguration the arrowConfiguration value to set.
      * @return the QueryFormat object itself.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryRequest.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryRequest.java
index 27f7c77c817c..cdb99cfa0107 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryRequest.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/QueryRequest.java
@@ -8,18 +8,19 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-/** the quick query body. */
+/** Groups the set of query request settings. */
 @JacksonXmlRootElement(localName = "QueryRequest")
 @Fluent
 public final class QueryRequest {
     /*
-     * the query type
+     * Required. The type of the provided query expression.
      */
     @JsonProperty(value = "QueryType", required = true)
     private String queryType;
 
     /*
-     * a query statement
+     * The query expression in SQL. The maximum size of the query expression is
+     * 256KiB.
      */
     @JsonProperty(value = "Expression", required = true)
     private String expression;
@@ -42,7 +43,7 @@ public QueryRequest() {
     }
 
     /**
-     * Get the queryType property: the query type.
+     * Get the queryType property: Required. The type of the provided query expression.
      *
      * @return the queryType value.
      */
@@ -51,7 +52,7 @@ public String getQueryType() {
     }
 
     /**
-     * Set the queryType property: the query type.
+     * Set the queryType property: Required. The type of the provided query expression.
      *
      * @param queryType the queryType value to set.
      * @return the QueryRequest object itself.
@@ -62,7 +63,7 @@ public QueryRequest setQueryType(String queryType) {
     }
 
     /**
-     * Get the expression property: a query statement.
+     * Get the expression property: The query expression in SQL. The maximum size of the query expression is 256KiB.
      *
      * @return the expression value.
      */
@@ -71,7 +72,7 @@ public String getExpression() {
     }
 
     /**
-     * Set the expression property: a query statement.
+     * Set the expression property: The query expression in SQL. The maximum size of the query expression is 256KiB.
      *
      * @param expression the expression value to set.
      * @return the QueryRequest object itself.
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
index 7d1e0f31de4b..22c6f70adbf5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
@@ -18,6 +18,8 @@
 import com.azure.storage.blob.implementation.models.FilterBlobItem;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
 import com.azure.storage.blob.models.BlobDownloadHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.models.BlobItem;
 import com.azure.storage.blob.models.BlobItemProperties;
 import com.azure.storage.blob.models.BlobLeaseRequestConditions;
@@ -239,6 +241,13 @@ public static BlobDownloadHeaders populateBlobDownloadHeaders(
         headers.setObjectReplicationSourcePolicies(objectReplicationSourcePolicies);
         headers.setSealed(internalHeaders.isXMsBlobSealed());
         headers.setLastAccessedTime(internalHeaders.getXMsLastAccessTime());
+        headers.setCurrentVersion(internalHeaders.isXMsIsCurrentVersion());
+
+        headers.setImmutabilityPolicy(new BlobImmutabilityPolicy()
+            .setPolicyMode(internalHeaders.getXMsImmutabilityPolicyMode() == null ? null
+            : BlobImmutabilityPolicyMode.fromString(internalHeaders.getXMsImmutabilityPolicyMode()))
+            .setExpiryTime(internalHeaders.getXMsImmutabilityPolicyUntilDate()));
+        headers.setHasLegalHold(internalHeaders.isXMsLegalHold());
 
         return headers;
     }
@@ -329,6 +338,11 @@ public static BlobItemProperties populateBlobItemProperties(BlobItemPropertiesIn
         blobItemProperties.setRehydratePriority(blobItemPropertiesInternal.getRehydratePriority());
         blobItemProperties.setSealed(blobItemPropertiesInternal.isSealed());
         blobItemProperties.setLastAccessedTime(blobItemPropertiesInternal.getLastAccessedOn());
+        blobItemProperties.setExpiryTime(blobItemPropertiesInternal.getExpiresOn());
+        blobItemProperties.setImmutabilityPolicy(new BlobImmutabilityPolicy()
+            .setExpiryTime(blobItemPropertiesInternal.getImmutabilityPolicyExpiresOn())
+            .setPolicyMode(blobItemPropertiesInternal.getImmutabilityPolicyMode()));
+        blobItemProperties.setHasLegalHold(blobItemPropertiesInternal.isLegalHold());
 
         return blobItemProperties;
     }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
index 8ee9941b2f2d..45577d0158ed 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerItemProperties.java
@@ -364,7 +364,7 @@ public Boolean isImmutableStorageWithVersioningEnabled() {
      * @param isImmutableStorageWithVersioningEnabled the isImmutableStorageWithVersioningEnabled value to set.
      * @return the BlobContainerItemProperties object itself.
      */
-    public BlobContainerItemProperties setIsImmutableStorageWithVersioningEnabled(
+    public BlobContainerItemProperties setImmutableStorageWithVersioningEnabled(
             Boolean isImmutableStorageWithVersioningEnabled) {
         this.isImmutableStorageWithVersioningEnabled = isImmutableStorageWithVersioningEnabled;
         return this;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerProperties.java
index d67cbb799b59..dc48dd654ca4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobContainerProperties.java
@@ -25,6 +25,7 @@ public final class BlobContainerProperties {
     private final boolean hasLegalHold;
     private final String defaultEncryptionScope;
     private final Boolean encryptionScopeOverridePrevented;
+    private final Boolean isImmutableStorageWithVersioningEnabled;
 
     /**
      * Constructs a {@link BlobContainerProperties}.
@@ -67,6 +68,33 @@ public BlobContainerProperties(final Map<String, String> metadata, final String
         final LeaseStatusType leaseStatus, final PublicAccessType blobPublicAccess, final boolean hasImmutabilityPolicy,
         final boolean hasLegalHold, final String defaultEncryptionScope,
         final Boolean encryptionScopeOverridePrevented) {
+        this(metadata, eTag, lastModified, leaseDuration, leaseState, leaseStatus, blobPublicAccess,
+            hasImmutabilityPolicy, hasLegalHold, defaultEncryptionScope, encryptionScopeOverridePrevented,
+            null);
+    }
+
+    /**
+     * Constructs a {@link BlobContainerProperties}.
+     *
+     * @param metadata Metadata associated with the container.
+     * @param eTag ETag of the container.
+     * @param lastModified Datetime when the container was last modified.
+     * @param leaseDuration Type of the lease on the container.
+     * @param leaseState State of the lease on the container.
+     * @param leaseStatus Status of the lease on the container.
+     * @param blobPublicAccess Public access status for the container.
+     * @param hasImmutabilityPolicy Flag indicating if the container has an immutability policy set on it.
+     * @param hasLegalHold Flag indicating if the container has a legal hold.
+     * @param defaultEncryptionScope The container's default encryption scope to encrypt blobs with.
+     * @param encryptionScopeOverridePrevented Whether or not a container's default encryption scope can be overriden
+     * @param isImmutableStorageWithVersioningEnabled Whether or not immutable storage with versioning is enabled on
+     *                                                this container.
+     */
+    public BlobContainerProperties(final Map<String, String> metadata, final String eTag,
+        final OffsetDateTime lastModified, final LeaseDurationType leaseDuration, final LeaseStateType leaseState,
+        final LeaseStatusType leaseStatus, final PublicAccessType blobPublicAccess, final boolean hasImmutabilityPolicy,
+        final boolean hasLegalHold, final String defaultEncryptionScope,
+        final Boolean encryptionScopeOverridePrevented, final Boolean isImmutableStorageWithVersioningEnabled) {
         this.metadata = metadata;
         this.eTag = eTag;
         this.lastModified = lastModified;
@@ -78,6 +106,7 @@ public BlobContainerProperties(final Map<String, String> metadata, final String
         this.hasLegalHold = hasLegalHold;
         this.defaultEncryptionScope = defaultEncryptionScope;
         this.encryptionScopeOverridePrevented = encryptionScopeOverridePrevented;
+        this.isImmutableStorageWithVersioningEnabled = isImmutableStorageWithVersioningEnabled;
     }
 
     /**
@@ -156,4 +185,11 @@ public String getDefaultEncryptionScope() {
     public Boolean isEncryptionScopeOverridePrevented() {
         return encryptionScopeOverridePrevented;
     }
+
+    /**
+     * @return Whether or not immutable storage with versioning is enabled on this container.
+     */
+    public Boolean isImmutableStorageWithVersioningEnabled() {
+        return isImmutableStorageWithVersioningEnabled;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
index 7f8fa4c22d81..c088ba179ffd 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java
@@ -332,6 +332,23 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "LastAccessTime")
     private OffsetDateTime lastAccessedTime;
 
+    /*
+     * The x-ms-is-current-version property.
+     */
+    @JsonProperty(value = "x-ms-is-current-version")
+    private Boolean currentVersion;
+
+    /*
+     * The x-ms-immutability-policy-mode and x-ms-immutability-policy-until-date property.
+     */
+    private BlobImmutabilityPolicy immutabilityPolicy;
+
+    /*
+     * The x-ms-legal-hold property.
+     */
+    @JsonProperty(value = "x-ms-legal-hold")
+    private Boolean hasLegalHold;
+
     /**
      * Get the lastModified property: Returns the date and time the container
      * was last modified. Any operation that modifies the blob, including an
@@ -1304,4 +1321,66 @@ public BlobDownloadHeaders setLastAccessedTime(OffsetDateTime lastAccessedTime)
         this.lastAccessedTime = lastAccessedTime;
         return this;
     }
+
+    /**
+     * Get the currentVersion property: The x-ms-is-current-version property.
+     *
+     * @return the currentVersion value.
+     */
+    public Boolean isCurrentVersion() {
+        return this.currentVersion;
+    }
+
+    /**
+     * Set the currentVersion property: The x-ms-is-current-version property.
+     *
+     * @param currentVersion the currentVersion value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders setCurrentVersion(Boolean currentVersion) {
+        this.currentVersion = currentVersion;
+        return this;
+    }
+
+    /**
+     * Get the immutabilityPolicy property: The  x-ms-immutability-policy-mode and x-ms-immutability-policy-until-date
+     * property.
+     *
+     * @return the immutabilityPolicy value.
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return this.immutabilityPolicy;
+    }
+
+    /**
+     * Set the immutabilityPolicy property:  x-ms-immutability-policy-mode and x-ms-immutability-policy-until-date
+     * property.
+     *
+     * @param immutabilityPolicy the immutabilityPolicy value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * Get the hasLegalHold property: The x-ms-legal-hold property.
+     *
+     * @return the hasLegalHold value.
+     */
+    public Boolean hasLegalHold() {
+        return this.hasLegalHold;
+    }
+
+    /**
+     * Set the hasLegalHold property: The x-ms-legal-hold property.
+     *
+     * @param hasLegalHold the xMsLegalHold value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders setHasLegalHold(Boolean hasLegalHold) {
+        this.hasLegalHold = hasLegalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicy.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicy.java
new file mode 100644
index 000000000000..c6308f8efb38
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicy.java
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob.models;
+
+import java.time.OffsetDateTime;
+
+/**
+ * Optional parameters for setting the immutability policy of a blob, blob snapshot or blob version.
+ */
+public class BlobImmutabilityPolicy {
+
+    private OffsetDateTime expiryTime;
+    private BlobImmutabilityPolicyMode policyMode;
+
+    /**
+     * @return The time when the immutability policy expires.
+     */
+    public OffsetDateTime getExpiryTime() {
+        return expiryTime;
+    }
+
+    /**
+     * @param expiryTime The time when the immutability policy expires.
+     * @return The updated BlobImmutabilityPolicy
+     */
+    public BlobImmutabilityPolicy setExpiryTime(OffsetDateTime expiryTime) {
+        this.expiryTime = expiryTime;
+        return this;
+    }
+
+    /**
+     * @return The immutability policy mode.
+     */
+    public BlobImmutabilityPolicyMode getPolicyMode() {
+        return policyMode;
+    }
+
+    /**
+     * @param policyMode The immutability policy mode.
+     * @return The updated BlobImmutabilityPolicy
+     */
+    public BlobImmutabilityPolicy setPolicyMode(BlobImmutabilityPolicyMode policyMode) {
+        this.policyMode = policyMode;
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicyMode.java
similarity index 93%
rename from sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java
rename to sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicyMode.java
index 4c483833f7ac..c43ac19042d5 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobImmutabilityPolicyMode.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobImmutabilityPolicyMode.java
@@ -2,21 +2,21 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.storage.blob.implementation.models;
+package com.azure.storage.blob.models;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /** Defines values for BlobImmutabilityPolicyMode. */
 public enum BlobImmutabilityPolicyMode {
+    /** Enum value Mutable. */
+    MUTABLE("Mutable"),
+
     /** Enum value Unlocked. */
     UNLOCKED("Unlocked"),
 
     /** Enum value Locked. */
-    LOCKED("Locked"),
-
-    /** Enum value Mutable. */
-    MUTABLE("Mutable");
+    LOCKED("Locked");
 
     /** The actual serialized value for a BlobImmutabilityPolicyMode instance. */
     private final String value;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItemProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItemProperties.java
index 233ea037bacf..29bbe0d8b89f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItemProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItemProperties.java
@@ -237,6 +237,23 @@ public final class BlobItemProperties {
     @JsonProperty(value = "LastAccessTime")
     private OffsetDateTime lastAccessedTime;
 
+    /*
+     * The Expiry-Time property.
+     */
+    @JsonProperty(value = "Expiry-Time")
+    private OffsetDateTime expiryTime;
+
+    /*
+     * The ImmutabilityPolicyUntilDate and ImmutabilityPolicyMode property.
+     */
+    private BlobImmutabilityPolicy immutabilityPolicy;
+
+    /*
+     * The LegalHold property.
+     */
+    @JsonProperty(value = "LegalHold")
+    private Boolean hasLegalHold;
+
     /**
      * Get the creationTime property: The creationTime property.
      *
@@ -985,4 +1002,64 @@ public BlobItemProperties setLastAccessedTime(OffsetDateTime lastAccessedTime) {
         this.lastAccessedTime = lastAccessedTime;
         return this;
     }
+
+    /**
+     * Get the expiryTime property: The Expiry-Time property.
+     *
+     * @return the expiryTime value.
+     */
+    public OffsetDateTime getExpiryTime() {
+        return this.expiryTime;
+    }
+
+    /**
+     * Set the expiryTime property: The Expiry-Time property.
+     *
+     * @param expiryTime the expiryTime value to set.
+     * @return the BlobItemProperties object itself.
+     */
+    public BlobItemProperties setExpiryTime(OffsetDateTime expiryTime) {
+        this.expiryTime = expiryTime;
+        return this;
+    }
+
+    /**
+     * Get the immutabilityPolicy property: The ImmutabilityPolicyUntilDate and ImmutabilityPolicyMode property.
+     *
+     * @return the immutabilityPolicy value.
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return this.immutabilityPolicy;
+    }
+
+    /**
+     * Set the immutabilityPolicy property: The ImmutabilityPolicyUntilDate and ImmutabilityPolicyMode property.
+     *
+     * @param immutabilityPolicy the immutabilityPolicy value to set.
+     * @return the BlobItemProperties object itself.
+     */
+    public BlobItemProperties setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * Get the hasLegalHold property: The LegalHold property.
+     *
+     * @return the hasLegalHold value.
+     */
+    public Boolean hasLegalHold() {
+        return this.hasLegalHold;
+    }
+
+    /**
+     * Set the hasLegalHold property: The LegalHold property.
+     *
+     * @param hasLegalHold the v value to set.
+     * @return the BlobItemProperties object itself.
+     */
+    public BlobItemProperties setHasLegalHold(Boolean hasLegalHold) {
+        this.hasLegalHold = hasLegalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
new file mode 100644
index 000000000000..a25179528491
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob.models;
+
+/**
+ * The blob legal hold result.
+ */
+public class BlobLegalHoldResult {
+
+    private final boolean hasLegalHold;
+
+    /**
+     * Creates a new BlobLegalHoldResult
+     * @param hasLegalHold whether or not a legal hold is enabled on the blob.
+     */
+    public BlobLegalHoldResult(boolean hasLegalHold) {
+        this.hasLegalHold = hasLegalHold;
+    }
+
+    /**
+     * @return whether or not a legal hold is enabled on the blob.
+     */
+    public boolean hasLegalHold() {
+        return hasLegalHold;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
index ba7e4ae38999..044dd4ac6e66 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
@@ -23,6 +23,8 @@ public final class BlobListDetails {
     private boolean retrieveUncommittedBlobs;
     private boolean retrieveDeletedBlobs;
     private boolean retrieveVersions;
+    private boolean retrieveImmutabilityPolicy;
+    private boolean retrieveLegalHold;
 
     /**
      * Constructs an unpopulated {@link BlobListDetails}.
@@ -172,6 +174,46 @@ public BlobListDetails setRetrieveDeletedBlobs(boolean retrieveDeletedBlobs) {
         return this;
     }
 
+    /**
+     * Whether immutability policy for the blob should be returned.
+     *
+     * @return a flag indicating if immutability policy for the blob will be returned in the listing
+     */
+    public boolean getRetrieveImmutabilityPolicy() {
+        return retrieveImmutabilityPolicy;
+    }
+
+    /**
+     * Whether immutability policy for the blob should be returned.
+     *
+     * @param retrieveImmutabilityPolicy Flag indicating whether immutability policy for the blob should be returned
+     * @return the updated BlobListDetails object
+     */
+    public BlobListDetails setRetrieveImmutabilityPolicy(boolean retrieveImmutabilityPolicy) {
+        this.retrieveImmutabilityPolicy = retrieveImmutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * Whether legal hold for the blob should be returned.
+     *
+     * @return a flag indicating if legal hold for the blob will be returned in the listing
+     */
+    public boolean getRetrieveLegalHold() {
+        return retrieveLegalHold;
+    }
+
+    /**
+     * Whether legal hold for the blob should be returned.
+     *
+     * @param retrieveLegalHold Flag indicating whetherlegal hold for the blob  should be returned
+     * @return the updated BlobListDetails object
+     */
+    public BlobListDetails setRetrieveLegalHold(boolean retrieveLegalHold) {
+        this.retrieveLegalHold = retrieveLegalHold;
+        return this;
+    }
+
     /**
      * @return a list of the flag set to true
      */
@@ -198,6 +240,12 @@ public ArrayList<ListBlobsIncludeItem> toList() {
         if (this.retrieveVersions) {
             details.add(ListBlobsIncludeItem.VERSIONS);
         }
+        if (this.retrieveImmutabilityPolicy) {
+            details.add(ListBlobsIncludeItem.IMMUTABILITYPOLICY);
+        }
+        if (this.retrieveLegalHold) {
+            details.add(ListBlobsIncludeItem.LEGALHOLD);
+        }
         return details;
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
index ac761eb38760..cf75ae65dede 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobProperties.java
@@ -58,6 +58,9 @@ public final class BlobProperties {
     private final Boolean isSealed;
     private final OffsetDateTime lastAccessedTime;
     private final OffsetDateTime expiresOn;
+    private final BlobImmutabilityPolicy immutabilityPolicy;
+    private final Boolean hasLegalHold;
+
     /**
      * Constructs a {@link BlobProperties}.
      *
@@ -311,6 +314,80 @@ public BlobProperties(final OffsetDateTime creationTime, final OffsetDateTime la
         final List<ObjectReplicationPolicy> objectReplicationSourcePolicies,
         final String objectReplicationDestinationPolicyId, final RehydratePriority rehydratePriority,
         final Boolean isSealed, final OffsetDateTime lastAccessedTime, final OffsetDateTime expiresOn) {
+        this(creationTime, lastModified, eTag, blobSize, contentType, contentMd5, contentEncoding, contentDisposition,
+            contentLanguage, cacheControl, blobSequenceNumber, blobType, leaseStatus, leaseState, leaseDuration,
+            copyId, copyStatus, copySource, copyProgress, copyCompletionTime, copyStatusDescription, isServerEncrypted,
+            isIncrementalCopy, copyDestinationSnapshot, accessTier, isAccessTierInferred, archiveStatus,
+            encryptionKeySha256, encryptionScope, accessTierChangeTime, metadata, committedBlockCount, tagCount,
+            versionId, isCurrentVersion, objectReplicationSourcePolicies, objectReplicationDestinationPolicyId,
+            rehydratePriority, isSealed, lastAccessedTime, expiresOn, null, false);
+    }
+
+    /**
+     * Constructs a {@link BlobProperties}.
+     *
+     * @param creationTime Creation time of the blob.
+     * @param lastModified Datetime when the blob was last modified.
+     * @param eTag ETag of the blob.
+     * @param blobSize Size of the blob.
+     * @param contentType Content type specified for the blob.
+     * @param contentMd5 Content MD5 specified for the blob.
+     * @param contentEncoding Content encoding specified for the blob.
+     * @param contentDisposition Content disposition specified for the blob.
+     * @param contentLanguage Content language specified for the blob.
+     * @param cacheControl Cache control specified for the blob.
+     * @param blobSequenceNumber The current sequence number for a page blob, if the blob is an append or block blob
+     * pass {@code null}.
+     * @param blobType Type of the blob.
+     * @param leaseStatus Status of the lease on the blob.
+     * @param leaseState State of the lease on the blob.
+     * @param leaseDuration Type of lease on the blob.
+     * @param copyId Identifier of the last copy operation performed on the blob.
+     * @param copyStatus Status of the last copy operation performed on the blob.
+     * @param copySource Source of the last copy operation performed on the blob.
+     * @param copyProgress Progress of the last copy operation performed on the blob.
+     * @param copyCompletionTime Datetime when the last copy operation on the blob completed.
+     * @param copyStatusDescription Description of the last copy operation on the blob.
+     * @param isServerEncrypted Flag indicating if the blob's content is encrypted on the server.
+     * @param isIncrementalCopy Flag indicating if the blob was incrementally copied.
+     * @param copyDestinationSnapshot Snapshot identifier of the last incremental copy snapshot for the blob.
+     * @param accessTier Access tier of the blob.
+     * @param isAccessTierInferred Flag indicating if the access tier of the blob was inferred from properties of the
+     * blob.
+     * @param archiveStatus Archive status of the blob.
+     * @param encryptionKeySha256 SHA256 of the customer provided encryption key used to encrypt the blob on the server.
+     * @param encryptionScope The name of the encryption scope under which the blob is encrypted.
+     * @param accessTierChangeTime Datetime when the access tier of the blob last changed.
+     * @param metadata Metadata associated with the blob.
+     * @param committedBlockCount Number of blocks committed to an append blob, if the blob is a block or page blob
+     * pass {@code null}.
+     * @param versionId The version identifier of the blob.
+     * @param isCurrentVersion Flag indicating if version identifier points to current version of the blob.
+     * @param tagCount Number of tags associated with the blob.
+     * @param objectReplicationSourcePolicies The already parsed object replication policies.
+     * @param objectReplicationDestinationPolicyId The policy id on the destination blob.
+     * @param rehydratePriority The rehydrate priority
+     * @param isSealed Whether or not the blob is sealed.
+     * @param lastAccessedTime The date and time the blob was read or written to.
+     * @param expiresOn The time when the blob is going to expire.
+     * @param immutabilityPolicy the immutability policy of the blob.
+     * @param hasLegalHold whether or not the blob has a legal hold.
+     */
+    public BlobProperties(final OffsetDateTime creationTime, final OffsetDateTime lastModified, final String eTag,
+        final long blobSize, final String contentType, final byte[] contentMd5, final String contentEncoding,
+        final String contentDisposition, final String contentLanguage, final String cacheControl,
+        final Long blobSequenceNumber, final BlobType blobType, final LeaseStatusType leaseStatus,
+        final LeaseStateType leaseState, final LeaseDurationType leaseDuration, final String copyId,
+        final CopyStatusType copyStatus, final String copySource, final String copyProgress,
+        final OffsetDateTime copyCompletionTime, final String copyStatusDescription, final Boolean isServerEncrypted,
+        final Boolean isIncrementalCopy, final String copyDestinationSnapshot, final AccessTier accessTier,
+        final Boolean isAccessTierInferred, final ArchiveStatus archiveStatus, final String encryptionKeySha256,
+        final String encryptionScope, final OffsetDateTime accessTierChangeTime, final Map<String, String> metadata,
+        final Integer committedBlockCount, final Long tagCount, final String versionId, final Boolean isCurrentVersion,
+        final List<ObjectReplicationPolicy> objectReplicationSourcePolicies,
+        final String objectReplicationDestinationPolicyId, final RehydratePriority rehydratePriority,
+        final Boolean isSealed, final OffsetDateTime lastAccessedTime, final OffsetDateTime expiresOn,
+        BlobImmutabilityPolicy immutabilityPolicy, Boolean hasLegalHold) {
         this.creationTime = creationTime;
         this.lastModified = lastModified;
         this.eTag = eTag;
@@ -352,6 +429,8 @@ public BlobProperties(final OffsetDateTime creationTime, final OffsetDateTime la
         this.isSealed = isSealed;
         this.lastAccessedTime = lastAccessedTime;
         this.expiresOn = expiresOn;
+        this.immutabilityPolicy = immutabilityPolicy;
+        this.hasLegalHold = hasLegalHold;
     }
 
     /**
@@ -655,4 +734,18 @@ public OffsetDateTime getLastAccessedTime() {
     public OffsetDateTime getExpiresOn() {
         return expiresOn;
     }
+
+    /**
+     * @return the immutability policy.
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * @return whether or not the blob has a legal hold.
+     */
+    public Boolean hasLegalHold() {
+        return hasLegalHold;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
index ad4397648c4d..c6e027742245 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ListBlobsIncludeItem.java
@@ -34,7 +34,10 @@ public enum ListBlobsIncludeItem {
     IMMUTABILITYPOLICY("immutabilitypolicy"),
 
     /** Enum value legalhold. */
-    LEGALHOLD("legalhold");
+    LEGALHOLD("legalhold"),
+
+    /** Enum value deletedwithversions. */
+    DELETEDWITHVERSIONS("deletedwithversions");
 
     /** The actual serialized value for a ListBlobsIncludeItem instance. */
     private final String value;
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/AppendBlobCreateOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/AppendBlobCreateOptions.java
index 27ab7db71b62..8991c7916c1d 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/AppendBlobCreateOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/AppendBlobCreateOptions.java
@@ -5,6 +5,7 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 
 import java.util.Map;
@@ -18,6 +19,8 @@ public class AppendBlobCreateOptions {
     private Map<String, String> metadata;
     private Map<String, String> tags;
     private BlobRequestConditions requestConditions;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @return {@link BlobHttpHeaders}
@@ -82,4 +85,40 @@ public AppendBlobCreateOptions setRequestConditions(BlobRequestConditions reques
         this.requestConditions = requestConditions;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public AppendBlobCreateOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public AppendBlobCreateOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobBeginCopyOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobBeginCopyOptions.java
index ecf3da6949d0..a025c6bf33e7 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobBeginCopyOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobBeginCopyOptions.java
@@ -5,6 +5,7 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
 import com.azure.storage.blob.models.RehydratePriority;
@@ -27,6 +28,8 @@ public class BlobBeginCopyOptions {
     private BlobRequestConditions destinationRequestConditions;
     private Duration pollInterval;
     private Boolean sealDestination;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @param sourceUrl The source URL to copy from. URLs outside of Azure may only be copied to block blobs.
@@ -176,4 +179,40 @@ public BlobBeginCopyOptions setSealDestination(Boolean sealDestination) {
         this.sealDestination = sealDestination;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public BlobBeginCopyOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public BlobBeginCopyOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobCopyFromUrlOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobCopyFromUrlOptions.java
index 5e92e2d9d499..bb96450327a8 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobCopyFromUrlOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobCopyFromUrlOptions.java
@@ -6,6 +6,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.http.RequestConditions;
 import com.azure.storage.blob.models.AccessTier;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.common.implementation.StorageImplUtils;
 
@@ -22,6 +23,8 @@ public class BlobCopyFromUrlOptions {
     private AccessTier tier;
     private RequestConditions sourceRequestConditions;
     private BlobRequestConditions destinationRequestConditions;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @param copySource The source URL to copy from. URLs outside of Azure may only be copied to block blobs.
@@ -118,4 +121,40 @@ public BlobCopyFromUrlOptions setDestinationRequestConditions(BlobRequestConditi
         this.destinationRequestConditions = destinationRequestConditions;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public BlobCopyFromUrlOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public BlobCopyFromUrlOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobParallelUploadOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobParallelUploadOptions.java
index b4825c1b2a0b..3943a4230f46 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobParallelUploadOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlobParallelUploadOptions.java
@@ -9,6 +9,7 @@
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.ParallelTransferOptions;
 import com.azure.storage.common.implementation.StorageImplUtils;
@@ -35,6 +36,8 @@ public class BlobParallelUploadOptions {
     private BlobRequestConditions requestConditions;
     private boolean computeMd5;
     private Duration timeout;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * Constructs a new {@code BlobParallelUploadOptions}.
@@ -274,4 +277,40 @@ public BlobParallelUploadOptions setTimeout(Duration timeout) {
         this.timeout = timeout;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public BlobParallelUploadOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public BlobParallelUploadOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobCommitBlockListOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobCommitBlockListOptions.java
index 8f1fa15aa107..3227f8f6ebae 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobCommitBlockListOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobCommitBlockListOptions.java
@@ -6,6 +6,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 
 import java.util.Collections;
@@ -23,6 +24,8 @@ public class BlockBlobCommitBlockListOptions {
     private Map<String, String> tags;
     private AccessTier tier;
     private BlobRequestConditions requestConditions;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @param base64BlockIds A list of base64 encode {@code String}s that specifies the block IDs to be committed.
@@ -117,4 +120,40 @@ public BlockBlobCommitBlockListOptions setRequestConditions(BlobRequestCondition
         this.requestConditions = requestConditions;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public BlockBlobCommitBlockListOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public BlockBlobCommitBlockListOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobSimpleUploadOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobSimpleUploadOptions.java
index bf1c9e0a83ae..d99af6534346 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobSimpleUploadOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/BlockBlobSimpleUploadOptions.java
@@ -6,6 +6,7 @@
 import com.azure.core.util.CoreUtils;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.common.implementation.StorageImplUtils;
 import reactor.core.publisher.Flux;
@@ -27,6 +28,8 @@ public class BlockBlobSimpleUploadOptions {
     private AccessTier tier;
     private byte[] contentMd5;
     private BlobRequestConditions requestConditions;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @param data The data to write to the blob. Note that this {@code Flux} must be replayable if retries are enabled
@@ -179,4 +182,40 @@ public BlockBlobSimpleUploadOptions setRequestConditions(BlobRequestConditions r
         this.requestConditions = requestConditions;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public BlockBlobSimpleUploadOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public BlockBlobSimpleUploadOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/PageBlobCreateOptions.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/PageBlobCreateOptions.java
index 89f6e3b4e801..915b1da1071c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/PageBlobCreateOptions.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/options/PageBlobCreateOptions.java
@@ -4,6 +4,7 @@
 package com.azure.storage.blob.options;
 
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRequestConditions;
 
 import java.util.Map;
@@ -18,6 +19,8 @@ public class PageBlobCreateOptions {
     private Map<String, String> metadata;
     private Map<String, String> tags;
     private BlobRequestConditions requestConditions;
+    private BlobImmutabilityPolicy immutabilityPolicy;
+    private Boolean legalHold;
 
     /**
      * @param size Specifies the maximum size for the page blob, up to 8 TB. The page blob size must be aligned to a
@@ -116,4 +119,40 @@ public PageBlobCreateOptions setRequestConditions(BlobRequestConditions requestC
         this.requestConditions = requestConditions;
         return this;
     }
+
+    /**
+     * @return {@link BlobImmutabilityPolicy}
+     */
+    public BlobImmutabilityPolicy getImmutabilityPolicy() {
+        return immutabilityPolicy;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy}
+     * @return The updated options.
+     */
+    public PageBlobCreateOptions setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        this.immutabilityPolicy = immutabilityPolicy;
+        return this;
+    }
+
+    /**
+     * @return If a legal hold should be placed on the blob.
+     */
+    public Boolean isLegalHold() {
+        return legalHold;
+    }
+
+    /**
+     * Note that this parameter is only applicable to a blob within a container that has immutable storage with
+     * versioning enabled.
+     * @param legalHold Indicates if a legal hold should be placed on the blob.
+     * @return The updated options.
+     */
+    public PageBlobCreateOptions setLegalHold(Boolean legalHold) {
+        this.legalHold = legalHold;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobContainerSasPermission.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobContainerSasPermission.java
index 71387cc63efd..f939f6458c0c 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobContainerSasPermission.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobContainerSasPermission.java
@@ -35,6 +35,8 @@ public final class BlobContainerSasPermission {
 
     private boolean executePermission;
 
+    private boolean immutabilityPolicyPermission;
+
     /**
      * Initializes an {@code BlobContainerSasPermission} object with all fields set to false.
      */
@@ -47,7 +49,8 @@ public BlobContainerSasPermission() {
      *
      * @param permissionString A {@code String} which represents the {@code BlobContainerSasPermission}.
      * @return A {@code BlobContainerSasPermission} generated from the given {@code String}.
-     * @throws IllegalArgumentException If {@code permissionString} contains a character other than r, a, c, w, d, x, l or t.
+     * @throws IllegalArgumentException If {@code permString} contains a character other than r, a, c, w, d, x, l, t or
+     * i.
      */
     public static BlobContainerSasPermission parse(String permissionString) {
         BlobContainerSasPermission permissions = new BlobContainerSasPermission();
@@ -85,6 +88,9 @@ public static BlobContainerSasPermission parse(String permissionString) {
                 case 'e':
                     permissions.executePermission = true;
                     break;
+                case 'i':
+                    permissions.immutabilityPolicyPermission = true;
+                    break;
                 default:
                     throw new IllegalArgumentException(
                         String.format(Locale.ROOT, Constants.ENUM_COULD_NOT_BE_PARSED_INVALID_VALUE,
@@ -274,6 +280,24 @@ public BlobContainerSasPermission setExecutePermission(boolean hasExecutePermiss
         return this;
     }
 
+    /**
+     * @return the set immutability policy permission status.
+     */
+    public boolean hasImmutabilityPolicyPermission() {
+        return immutabilityPolicyPermission;
+    }
+
+    /**
+     * Sets the set immutability policy permission status.
+     *
+     * @param immutabilityPolicyPermission Permission status to set
+     * @return the updated BlobSasPermission object.
+     */
+    public BlobContainerSasPermission setImmutabilityPolicyPermission(boolean immutabilityPolicyPermission) {
+        this.immutabilityPolicyPermission = immutabilityPolicyPermission;
+        return this;
+    }
+
     /**
      * Converts the given permissions to a {@code String}. Using this method will guarantee the permissions are in an
      * order accepted by the service.
@@ -326,6 +350,10 @@ public String toString() {
             builder.append('e');
         }
 
+        if (this.immutabilityPolicyPermission) {
+            builder.append('i');
+        }
+
         return builder.toString();
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasPermission.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasPermission.java
index a4b55cd4d914..7098aff0abb4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasPermission.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/sas/BlobSasPermission.java
@@ -35,6 +35,8 @@ public final class BlobSasPermission {
 
     private boolean executePermission;
 
+    private boolean immutabilityPolicyPermission;
+
     /**
      * Initializes a {@code BlobSasPermission} object with all fields set to false.
      */
@@ -47,8 +49,8 @@ public BlobSasPermission() {
      *
      * @param permissionString A {@code String} which represents the {@code BlobSasPermission}.
      * @return A {@code BlobSasPermission} generated from the given {@code String}.
-     * @throws IllegalArgumentException If {@code permissionString} contains a character other than r, a, c, w, d, x, l, t,
-     * m, or e.
+     * @throws IllegalArgumentException If {@code permString} contains a character other than r, a, c, w, d, x, l, t,
+     * m, e or i.
      */
     public static BlobSasPermission parse(String permissionString) {
         BlobSasPermission permissions = new BlobSasPermission();
@@ -86,6 +88,9 @@ public static BlobSasPermission parse(String permissionString) {
                 case 'e':
                     permissions.executePermission = true;
                     break;
+                case 'i':
+                    permissions.immutabilityPolicyPermission = true;
+                    break;
                 default:
                     throw new IllegalArgumentException(
                         String.format(Locale.ROOT, Constants.ENUM_COULD_NOT_BE_PARSED_INVALID_VALUE,
@@ -275,6 +280,23 @@ public BlobSasPermission setExecutePermission(boolean hasExecutePermission) {
         return this;
     }
 
+    /**
+     * @return the set immutability policy permission status.
+     */
+    public boolean hasImmutabilityPolicyPermission() {
+        return immutabilityPolicyPermission;
+    }
+
+    /**
+     * Sets the set immutability policy permission status.
+     *
+     * @param immutabilityPolicyPermission Permission status to set
+     * @return the updated BlobSasPermission object.
+     */
+    public BlobSasPermission setImmutabilityPolicyPermission(boolean immutabilityPolicyPermission) {
+        this.immutabilityPolicyPermission = immutabilityPolicyPermission;
+        return this;
+    }
 
     /**
      * Converts the given permissions to a {@code String}. Using this method will guarantee the permissions are in an
@@ -329,6 +351,10 @@ public String toString() {
             builder.append('e');
         }
 
+        if (this.immutabilityPolicyPermission) {
+            builder.append('i');
+        }
+
         return builder.toString();
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
index 83a1ba8b4f7f..da6752f193aa 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/AppendBlobAsyncClient.java
@@ -21,6 +21,7 @@
 import com.azure.storage.blob.implementation.models.AppendBlobsAppendBlockHeaders;
 import com.azure.storage.blob.implementation.models.AppendBlobsCreateHeaders;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.options.AppendBlobCreateOptions;
 import com.azure.storage.blob.models.AppendBlobRequestConditions;
 import com.azure.storage.blob.models.AppendBlobItem;
@@ -194,12 +195,15 @@ Mono<Response<AppendBlobItem>> createWithResponse(AppendBlobCreateOptions option
         BlobRequestConditions requestConditions = options.getRequestConditions();
         requestConditions = (requestConditions == null) ? new BlobRequestConditions() : requestConditions;
         context = context == null ? Context.NONE : context;
+        BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         return this.azureBlobStorage.getAppendBlobs().createWithResponseAsync(containerName, blobName, 0, null,
             options.getMetadata(), requestConditions.getLeaseId(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            tagsToString(options.getTags()), immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(),
+            options.isLegalHold(), options.getHeaders(), getCustomerProvidedKey(),
             encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 AppendBlobsCreateHeaders hd = rb.getDeserializedHeaders();
@@ -369,7 +373,7 @@ Mono<Response<AppendBlobItem>> appendBlockFromUrlWithResponse(String sourceUrl,
             destRequestConditions.getIfMatch(), destRequestConditions.getIfNoneMatch(),
             destRequestConditions.getTagsConditions(), sourceRequestConditions.getIfModifiedSince(),
             sourceRequestConditions.getIfUnmodifiedSince(), sourceRequestConditions.getIfMatch(),
-            sourceRequestConditions.getIfNoneMatch(), null, getCustomerProvidedKey(), encryptionScope,
+            sourceRequestConditions.getIfNoneMatch(), null, null, getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 AppendBlobsAppendBlockFromUrlHeaders hd = rb.getDeserializedHeaders();
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
index 8a358e19ecb9..f92df4953b6e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
@@ -30,6 +30,7 @@
 import com.azure.storage.blob.implementation.models.BlobTags;
 import com.azure.storage.blob.implementation.models.BlobsGetAccountInfoHeaders;
 import com.azure.storage.blob.implementation.models.BlobsGetPropertiesHeaders;
+import com.azure.storage.blob.implementation.models.BlobsSetImmutabilityPolicyHeaders;
 import com.azure.storage.blob.implementation.models.BlobsStartCopyFromURLHeaders;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.implementation.models.QueryRequest;
@@ -46,6 +47,9 @@
 import com.azure.storage.blob.models.BlobCopyInfo;
 import com.azure.storage.blob.models.BlobDownloadAsyncResponse;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
+import com.azure.storage.blob.models.BlobLegalHoldResult;
 import com.azure.storage.blob.models.BlobProperties;
 import com.azure.storage.blob.models.BlobQueryAsyncResponse;
 import com.azure.storage.blob.models.BlobRange;
@@ -542,13 +546,16 @@ public PollerFlux<BlobCopyInfo, Void> beginCopy(BlobBeginCopyOptions options) {
             options.getDestinationRequestConditions() == null
             ? new BlobRequestConditions()
             : options.getDestinationRequestConditions();
+        final BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         return new PollerFlux<>(interval,
             (pollingContext) -> {
                 try {
                     return onStart(options.getSourceUrl(), options.getMetadata(), options.getTags(),
                         options.getTier(), options.getRehydratePriority(), options.isSealDestination(),
-                        sourceModifiedCondition, destinationRequestConditions);
+                        sourceModifiedCondition, destinationRequestConditions, immutabilityPolicy,
+                        options.isLegalHold());
                 } catch (RuntimeException ex) {
                     return monoError(logger, ex);
                 }
@@ -581,7 +588,8 @@ public PollerFlux<BlobCopyInfo, Void> beginCopy(BlobBeginCopyOptions options) {
     private Mono<BlobCopyInfo> onStart(String sourceUrl, Map<String, String> metadata, Map<String, String> tags,
         AccessTier tier, RehydratePriority priority, Boolean sealBlob,
         BlobBeginCopySourceRequestConditions sourceModifiedRequestConditions,
-        BlobRequestConditions destinationRequestConditions) {
+        BlobRequestConditions destinationRequestConditions, BlobImmutabilityPolicy immutabilityPolicy,
+        Boolean legalHold) {
         URL url;
         try {
             url = new URL(sourceUrl);
@@ -597,7 +605,8 @@ private Mono<BlobCopyInfo> onStart(String sourceUrl, Map<String, String> metadat
                 destinationRequestConditions.getIfModifiedSince(), destinationRequestConditions.getIfUnmodifiedSince(),
                 destinationRequestConditions.getIfMatch(), destinationRequestConditions.getIfNoneMatch(),
                 destinationRequestConditions.getTagsConditions(), destinationRequestConditions.getLeaseId(), null,
-                tagsToString(tags), sealBlob, null, null, null, context))
+                tagsToString(tags), sealBlob, immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(),
+                legalHold, context))
             .map(response -> {
                 final BlobsStartCopyFromURLHeaders headers = response.getDeserializedHeaders();
 
@@ -816,6 +825,8 @@ Mono<Response<String>> copyFromUrlWithResponse(BlobCopyFromUrlOptions options, C
             ? new RequestConditions() : options.getSourceRequestConditions();
         BlobRequestConditions destRequestConditions = options.getDestinationRequestConditions() == null
             ? new BlobRequestConditions() : options.getDestinationRequestConditions();
+        BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         URL url;
         try {
@@ -832,7 +843,8 @@ Mono<Response<String>> copyFromUrlWithResponse(BlobCopyFromUrlOptions options, C
             destRequestConditions.getIfUnmodifiedSince(), destRequestConditions.getIfMatch(),
             destRequestConditions.getIfNoneMatch(), destRequestConditions.getTagsConditions(),
             destRequestConditions.getLeaseId(), null, null,
-            tagsToString(options.getTags()), null, null, null, context)
+            tagsToString(options.getTags()), immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(),
+            options.isLegalHold(), null, context)
             .map(rb -> new SimpleResponse<>(rb, rb.getDeserializedHeaders().getXMsCopyId()));
     }
 
@@ -1291,7 +1303,7 @@ private static Response<BlobProperties> buildBlobPropertiesResponse(BlobDownload
             hd.getEncryptionKeySha256(), hd.getEncryptionScope(), null, hd.getMetadata(),
             hd.getBlobCommittedBlockCount(), hd.getTagCount(), hd.getVersionId(), null,
             hd.getObjectReplicationSourcePolicies(), hd.getObjectReplicationDestinationPolicyId(), null,
-            hd.isSealed(), hd.getLastAccessedTime(), null);
+            hd.isSealed(), hd.getLastAccessedTime(), null, hd.getImmutabilityPolicy(), hd.hasLegalHold());
         return new SimpleResponse<>(response.getRequest(), response.getStatusCode(), response.getHeaders(), properties);
     }
 
@@ -1445,7 +1457,9 @@ Mono<Response<BlobProperties>> getPropertiesWithResponse(BlobRequestConditions r
                     ModelHelper.getObjectReplicationSourcePolicies(hd.getXMsOr()),
                     ModelHelper.getObjectReplicationDestinationPolicyId(hd.getXMsOr()),
                     RehydratePriority.fromString(hd.getXMsRehydratePriority()), hd.isXMsBlobSealed(),
-                    hd.getXMsLastAccessTime(), hd.getXMsExpiryTime());
+                    hd.getXMsLastAccessTime(), hd.getXMsExpiryTime(), new BlobImmutabilityPolicy()
+                    .setExpiryTime(hd.getXMsImmutabilityPolicyUntilDate())
+                    .setPolicyMode(hd.getXMsImmutabilityPolicyMode()), hd.isXMsLegalHold());
                 return new SimpleResponse<>(rb, properties);
             });
     }
@@ -2083,4 +2097,174 @@ qr, getCustomerProvidedKey(), context)
                     .read(),
                 ModelHelper.transformQueryHeaders(response.getHeaders())));
     }
+
+    /**
+     * Sets the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * object level immutable policy enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy}
+     *
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy The immutability policy}.
+     * @return A reactive response containing the immutability policy.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<BlobImmutabilityPolicy> setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        try {
+            return setImmutabilityPolicyWithResponse(immutabilityPolicy, null).flatMap(FluxUtil::toMono);
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    /**
+     * Sets the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions}
+     *
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy The immutability policy}.
+     * @param requestConditions {@link BlobRequestConditions}
+     * @return A reactive response containing the immutability policy.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<BlobImmutabilityPolicy>> setImmutabilityPolicyWithResponse(
+        BlobImmutabilityPolicy immutabilityPolicy, BlobRequestConditions requestConditions) {
+        try {
+            return withContext(context -> setImmutabilityPolicyWithResponse(immutabilityPolicy, requestConditions,
+                context));
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    Mono<Response<BlobImmutabilityPolicy>> setImmutabilityPolicyWithResponse(
+        BlobImmutabilityPolicy immutabilityPolicy, BlobRequestConditions requestConditions, Context context) {
+        context = context == null ? Context.NONE : context;
+        BlobImmutabilityPolicy finalImmutabilityPolicy = immutabilityPolicy == null ? new BlobImmutabilityPolicy()
+            : immutabilityPolicy;
+        if (BlobImmutabilityPolicyMode.MUTABLE.equals(finalImmutabilityPolicy.getPolicyMode())) {
+            throw logger.logExceptionAsError(new IllegalArgumentException(
+                String.format("immutabilityPolicy.policyMode must be %s or %s",
+                    BlobImmutabilityPolicyMode.LOCKED.toString(), BlobImmutabilityPolicyMode.UNLOCKED.toString())));
+        }
+
+        BlobRequestConditions finalRequestConditions = requestConditions == null
+            ? new BlobRequestConditions() : requestConditions;
+        // TODO (gapra) : Discuss, should we just expose ifUnmodifiedSince here?
+        return this.azureBlobStorage.getBlobs().setImmutabilityPolicyWithResponseAsync(containerName, blobName, null,
+            null, finalRequestConditions.getIfUnmodifiedSince(), finalImmutabilityPolicy.getExpiryTime(),
+            finalImmutabilityPolicy.getPolicyMode(),
+            context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            .map(response -> {
+                BlobsSetImmutabilityPolicyHeaders headers = response.getDeserializedHeaders();
+                BlobImmutabilityPolicy responsePolicy = new BlobImmutabilityPolicy()
+                    .setPolicyMode(headers.getXMsImmutabilityPolicyMode())
+                    .setExpiryTime(headers.getXMsImmutabilityPolicyUntilDate());
+                return new SimpleResponse<>(response, responsePolicy);
+            });
+    }
+
+    /**
+     * Deletes the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * object level immutable policy enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicy}
+     *
+     * @return A reactive response signalling completion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteImmutabilityPolicy() {
+        try {
+            return deleteImmutabilityPolicyWithResponse().flatMap(FluxUtil::toMono);
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    /**
+     * Deletes the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicyWithResponse}
+     *
+     * @return A reactive response signalling completion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Void>> deleteImmutabilityPolicyWithResponse() {
+        try {
+            return withContext(this::deleteImmutabilityPolicyWithResponse);
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    Mono<Response<Void>> deleteImmutabilityPolicyWithResponse(Context context) {
+        context = context == null ? Context.NONE : context;
+        return this.azureBlobStorage.getBlobs().deleteImmutabilityPolicyWithResponseAsync(containerName, blobName,
+            null, null, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            .map(response -> new SimpleResponse<>(response, null));
+    }
+
+    /**
+     * Sets a legal hold on the blob.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * object level immutable policy enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHold#boolean}
+     *
+     * @param legalHold Whether or not you want a legal hold on the blob.
+     * @return A reactive response containing the legal hold result.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<BlobLegalHoldResult> setLegalHold(boolean legalHold) {
+        try {
+            return setLegalHoldWithResponse(legalHold).flatMap(FluxUtil::toMono);
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    /**
+     * Sets a legal hold on the blob.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHoldWithResponse#boolean}
+     *
+     * @param legalHold Whether or not you want a legal hold on the blob.
+     * @return A reactive response containing the legal hold result.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<BlobLegalHoldResult>> setLegalHoldWithResponse(boolean legalHold) {
+        try {
+            return withContext(context -> setLegalHoldWithResponse(legalHold, context));
+        } catch (RuntimeException ex) {
+            return monoError(logger, ex);
+        }
+    }
+
+    Mono<Response<BlobLegalHoldResult>> setLegalHoldWithResponse(boolean legalHold, Context context) {
+        context = context == null ? Context.NONE : context;
+        return this.azureBlobStorage.getBlobs().setLegalHoldWithResponseAsync(containerName, blobName,
+            legalHold, null, null,
+            context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
+            .map(response -> new SimpleResponse<>(response,
+                new BlobLegalHoldResult(response.getDeserializedHeaders().isXMsLegalHold())));
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
index 2b5ed3c1b8fd..343ba77368cb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
@@ -20,6 +20,8 @@
 import com.azure.storage.blob.implementation.util.ModelHelper;
 import com.azure.storage.blob.models.BlobDownloadContentAsyncResponse;
 import com.azure.storage.blob.models.BlobDownloadContentResponse;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
+import com.azure.storage.blob.models.BlobLegalHoldResult;
 import com.azure.storage.blob.models.ConsistentReadControl;
 import com.azure.storage.blob.options.BlobBeginCopyOptions;
 import com.azure.storage.blob.options.BlobCopyFromUrlOptions;
@@ -1527,4 +1529,118 @@ public BlobQueryResponse queryWithResponse(BlobQueryOptions queryOptions, Durati
 
         return blockWithOptionalTimeout(download, timeout);
     }
+
+    /**
+     * Sets the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy}
+     *
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy The immutability policy}.
+     * @return The immutability policy.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BlobImmutabilityPolicy setImmutabilityPolicy(BlobImmutabilityPolicy immutabilityPolicy) {
+        return setImmutabilityPolicyWithResponse(immutabilityPolicy, null, null, Context.NONE).getValue();
+    }
+
+    /**
+     * Sets the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions-Duration-Context}
+     *
+     * @param immutabilityPolicy {@link BlobImmutabilityPolicy The immutability policy}.
+     * @param requestConditions {@link BlobRequestConditions}
+     * @param timeout An optional timeout value beyond which a {@link RuntimeException} will be raised.
+     * @param context Additional context that is passed through the Http pipeline during the service call.
+     * @return A response containing the immutability policy.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<BlobImmutabilityPolicy> setImmutabilityPolicyWithResponse(BlobImmutabilityPolicy immutabilityPolicy,
+        BlobRequestConditions requestConditions, Duration timeout, Context context) {
+        Mono<Response<BlobImmutabilityPolicy>> response = client.setImmutabilityPolicyWithResponse(immutabilityPolicy,
+            requestConditions, context);
+
+        return blockWithOptionalTimeout(response, timeout);
+    }
+
+    /**
+     * Delete the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicy}
+     *
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void deleteImmutabilityPolicy() {
+        deleteImmutabilityPolicyWithResponse(null, Context.NONE).getValue();
+    }
+
+    /**
+     * Delete the immutability policy on a blob, blob snapshot or blob version.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicyWithResponse#Duration-Context}
+     *
+     * @param timeout An optional timeout value beyond which a {@link RuntimeException} will be raised.
+     * @param context Additional context that is passed through the Http pipeline during the service call.
+     * @return A response containing the immutability policy.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<Void> deleteImmutabilityPolicyWithResponse(Duration timeout, Context context) {
+        Mono<Response<Void>> response = client.deleteImmutabilityPolicyWithResponse(context);
+
+        return blockWithOptionalTimeout(response, timeout);
+    }
+
+    /**
+     * Sets a legal hold on the blob.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.setLegalHold#boolean}
+     *
+     * @param legalHold Whether or not you want a legal hold on the blob.
+     * @return The legal hold result.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BlobLegalHoldResult setLegalHold(boolean legalHold) {
+        return setLegalHoldWithResponse(legalHold, null, Context.NONE).getValue();
+    }
+
+    /**
+     * Sets a legal hold on the blob.
+     * <p> NOTE: Blob Versioning must be enabled on your storage account and the blob must be in a container with
+     * immutable storage with versioning enabled to call this API.</p>
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.setLegalHoldWithResponse#boolean-Duration-Context}
+     *
+     * @param legalHold Whether or not you want a legal hold on the blob.
+     * @param timeout An optional timeout value beyond which a {@link RuntimeException} will be raised.
+     * @param context Additional context that is passed through the Http pipeline during the service call.
+     * @return A response containing the legal hold result.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<BlobLegalHoldResult> setLegalHoldWithResponse(boolean legalHold, Duration timeout, Context context) {
+        Mono<Response<BlobLegalHoldResult>> response = client.setLegalHoldWithResponse(legalHold, context);
+
+        return blockWithOptionalTimeout(response, timeout);
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
index 25dd01dc286e..64c8ea9c06d4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlockBlobAsyncClient.java
@@ -20,6 +20,7 @@
 import com.azure.storage.blob.implementation.models.EncryptionScope;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.BlockBlobItem;
@@ -261,13 +262,16 @@ Mono<Response<BlockBlobItem>> uploadWithResponse(BlockBlobSimpleUploadOptions op
         BlobRequestConditions requestConditions = options.getRequestConditions() == null ? new BlobRequestConditions()
             : options.getRequestConditions();
         context = context == null ? Context.NONE : context;
+        BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         return this.azureBlobStorage.getBlockBlobs().uploadWithResponseAsync(containerName, blobName,
             options.getLength(), data, null, options.getContentMd5(), options.getMetadata(),
             requestConditions.getLeaseId(), options.getTier(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            tagsToString(options.getTags()), immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(),
+            options.isLegalHold(), options.getHeaders(), getCustomerProvidedKey(),
             encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 BlockBlobsUploadHeaders hd = rb.getDeserializedHeaders();
@@ -387,7 +391,7 @@ Mono<Response<BlockBlobItem>> uploadFromUrlWithResponse(BlobUploadFromUrlOptions
             sourceRequestConditions.getIfMatch(), sourceRequestConditions.getIfNoneMatch(),
             sourceRequestConditions.getTagsConditions(),
             null, options.getContentMd5(), tagsToString(options.getTags()),
-            options.isCopySourceBlobProperties(), options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
+            options.isCopySourceBlobProperties(), null, options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 BlockBlobsPutBlobFromUrlHeaders hd = rb.getDeserializedHeaders();
@@ -554,7 +558,7 @@ Mono<Response<Void>> stageBlockFromUrlWithResponse(String base64BlockId, String
         return this.azureBlobStorage.getBlockBlobs().stageBlockFromURLWithResponseAsync(containerName, blobName, base64BlockId, 0,
             url, sourceRange.toHeaderValue(), sourceContentMd5, null, null, leaseId,
             sourceRequestConditions.getIfModifiedSince(), sourceRequestConditions.getIfUnmodifiedSince(),
-            sourceRequestConditions.getIfMatch(), sourceRequestConditions.getIfNoneMatch(), null,
+            sourceRequestConditions.getIfMatch(), sourceRequestConditions.getIfNoneMatch(), null, null,
             getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(response -> new SimpleResponse<>(response, null));
@@ -752,13 +756,16 @@ Mono<Response<BlockBlobItem>> commitBlockListWithResponse(BlockBlobCommitBlockLi
         BlobRequestConditions requestConditions = options.getRequestConditions() == null ? new BlobRequestConditions()
             : options.getRequestConditions();
         context = context == null ? Context.NONE : context;
+        BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         return this.azureBlobStorage.getBlockBlobs().commitBlockListWithResponseAsync(containerName, blobName,
             new BlockLookupList().setLatest(options.getBase64BlockIds()), null, null, null, options.getMetadata(),
             requestConditions.getLeaseId(), options.getTier(), requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
             requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null,
-            tagsToString(options.getTags()), null, null, null, options.getHeaders(), getCustomerProvidedKey(),
+            tagsToString(options.getTags()), immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(),
+            options.isLegalHold(), options.getHeaders(), getCustomerProvidedKey(),
             encryptionScope, context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 BlockBlobsCommitBlockListHeaders hd = rb.getDeserializedHeaders();
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
index 013f067bd9e7..74d7a8bee802 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/PageBlobAsyncClient.java
@@ -25,6 +25,7 @@
 import com.azure.storage.blob.implementation.models.PageBlobsUploadPagesHeaders;
 import com.azure.storage.blob.implementation.util.ModelHelper;
 import com.azure.storage.blob.models.BlobHttpHeaders;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobRange;
 import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.CopyStatusType;
@@ -246,13 +247,16 @@ Mono<Response<PageBlobItem>> createWithResponse(PageBlobCreateOptions options, C
                 new IllegalArgumentException("SequenceNumber must be greater than or equal to 0."));
         }
         context = context == null ? Context.NONE : context;
+        BlobImmutabilityPolicy immutabilityPolicy = options.getImmutabilityPolicy() == null
+            ? new BlobImmutabilityPolicy() : options.getImmutabilityPolicy();
 
         return this.azureBlobStorage.getPageBlobs().createWithResponseAsync(containerName, blobName, 0,
             options.getSize(), null, null, options.getMetadata(), requestConditions.getLeaseId(),
             requestConditions.getIfModifiedSince(), requestConditions.getIfUnmodifiedSince(),
             requestConditions.getIfMatch(), requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(),
-            options.getSequenceNumber(), null, tagsToString(options.getTags()), null, null, null, options.getHeaders(),
-            getCustomerProvidedKey(), encryptionScope,
+            options.getSequenceNumber(), null, tagsToString(options.getTags()),
+            immutabilityPolicy.getExpiryTime(), immutabilityPolicy.getPolicyMode(), options.isLegalHold(),
+            options.getHeaders(), getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 PageBlobsCreateHeaders hd = rb.getDeserializedHeaders();
@@ -470,7 +474,7 @@ Mono<Response<PageBlobItem>> uploadPagesFromUrlWithResponse(PageRange range, Str
             destRequestConditions.getIfMatch(), destRequestConditions.getIfNoneMatch(),
             destRequestConditions.getTagsConditions(), sourceRequestConditions.getIfModifiedSince(),
             sourceRequestConditions.getIfUnmodifiedSince(), sourceRequestConditions.getIfMatch(),
-            sourceRequestConditions.getIfNoneMatch(), null, getCustomerProvidedKey(), encryptionScope,
+            sourceRequestConditions.getIfNoneMatch(), null, null, getCustomerProvidedKey(), encryptionScope,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(rb -> {
                 PageBlobsUploadPagesFromURLHeaders hd = rb.getDeserializedHeaders();
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
index f8d59599cb58..244a47f6cefd 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
@@ -11,6 +11,8 @@
 import com.azure.storage.blob.BlobServiceVersion;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.options.BlobBeginCopyOptions;
 import com.azure.storage.blob.options.BlobCopyFromUrlOptions;
 import com.azure.storage.blob.models.BlobCopyInfo;
@@ -736,4 +738,60 @@ public void queryWithResponse() {
             });
         // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.queryWithResponse#BlobQueryOptions
     }
+
+    /**
+     * Code snippet for {@link BlobAsyncClientBase#setImmutabilityPolicy(BlobImmutabilityPolicy)} and
+     * {@link BlobAsyncClientBase#setImmutabilityPolicyWithResponse(BlobImmutabilityPolicy, BlobRequestConditions)}
+     */
+    public void setImmutabilityPolicy() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy
+        BlobImmutabilityPolicy policy = new BlobImmutabilityPolicy()
+            .setPolicyMode(BlobImmutabilityPolicyMode.LOCKED)
+            .setExpiryTime(OffsetDateTime.now().plusDays(1));
+        client.setImmutabilityPolicy(policy).subscribe(response -> System.out.println("Completed. Set immutability "
+            + "policy to " + response.getPolicyMode()));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions
+        BlobImmutabilityPolicy immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setPolicyMode(BlobImmutabilityPolicyMode.LOCKED)
+            .setExpiryTime(OffsetDateTime.now().plusDays(1));
+        BlobRequestConditions requestConditions = new BlobRequestConditions()
+            .setIfUnmodifiedSince(OffsetDateTime.now().minusDays(1));
+        client.setImmutabilityPolicyWithResponse(immutabilityPolicy, requestConditions).subscribe(response ->
+            System.out.println("Completed. Set immutability policy to " + response.getValue().getPolicyMode()));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions
+    }
+
+    /**
+     * Code snippet for {@link BlobAsyncClientBase#deleteImmutabilityPolicy()} and
+     * {@link BlobAsyncClientBase#deleteImmutabilityPolicyWithResponse()}
+     */
+    public void deleteImmutabilityPolicy() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicy
+        client.deleteImmutabilityPolicy().subscribe(response -> System.out.println("Completed immutability policy"
+            + " deletion."));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicy
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicyWithResponse
+        client.deleteImmutabilityPolicyWithResponse().subscribe(response ->
+            System.out.println("Delete immutability policy completed with status: " + response.getStatusCode()));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.deleteImmutabilityPolicyWithResponse
+    }
+
+    /**
+     * Code snippet for {@link BlobAsyncClientBase#setLegalHold(boolean)} and
+     * {@link BlobAsyncClientBase#setLegalHoldWithResponse(boolean)}
+     */
+    public void setLegalHold() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHold#boolean
+        client.setLegalHold(true).subscribe(response -> System.out.println("Legal hold status: "
+            + response.hasLegalHold()));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHold#boolean
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHoldWithResponse#boolean
+        client.setLegalHoldWithResponse(true).subscribe(response ->
+            System.out.println("Legal hold status: " + response.getValue().hasLegalHold()));
+        // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.setLegalHoldWithResponse#boolean
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
index 0b90402ac35a..059e2c2ef719 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
@@ -4,6 +4,7 @@
 package com.azure.storage.blob.specialized;
 
 import com.azure.core.http.RequestConditions;
+import com.azure.core.http.rest.Response;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -12,6 +13,8 @@
 import com.azure.storage.blob.BlobServiceClientBuilder;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
 import com.azure.storage.blob.models.BlobDownloadContentResponse;
+import com.azure.storage.blob.models.BlobImmutabilityPolicy;
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
 import com.azure.storage.blob.options.BlobBeginCopyOptions;
 import com.azure.storage.blob.options.BlobCopyFromUrlOptions;
 import com.azure.storage.blob.models.BlobProperties;
@@ -705,4 +708,60 @@ public void queryWithResponse() {
                 .getStatusCode());
         // END: com.azure.storage.blob.specialized.BlobClientBase.queryWithResponse#BlobQueryOptions-Duration-Context
     }
+
+    /**
+     * Code snippet for {@link BlobClientBase#setImmutabilityPolicy(BlobImmutabilityPolicy)} and
+     * {@link BlobClientBase#setImmutabilityPolicyWithResponse(BlobImmutabilityPolicy, BlobRequestConditions, Duration, Context)}
+     */
+    public void setImmutabilityPolicy() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy
+        BlobImmutabilityPolicy policy = new BlobImmutabilityPolicy()
+            .setPolicyMode(BlobImmutabilityPolicyMode.LOCKED)
+            .setExpiryTime(OffsetDateTime.now().plusDays(1));
+        BlobImmutabilityPolicy setPolicy = client.setImmutabilityPolicy(policy);
+        System.out.println("Successfully completed setting the immutability policy");
+        // END: com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicy#BlobImmutabilityPolicy
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions-Duration-Context
+        BlobImmutabilityPolicy immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setPolicyMode(BlobImmutabilityPolicyMode.LOCKED)
+            .setExpiryTime(OffsetDateTime.now().plusDays(1));
+        BlobRequestConditions requestConditions = new BlobRequestConditions()
+            .setIfUnmodifiedSince(OffsetDateTime.now().minusDays(1));
+        Response<BlobImmutabilityPolicy> response = client.setImmutabilityPolicyWithResponse(immutabilityPolicy,
+            requestConditions, timeout, new Context(key1, value1));
+        System.out.println("Successfully completed setting the immutability policy");
+        // END: com.azure.storage.blob.specialized.BlobClientBase.setImmutabilityPolicyWithResponse#BlobImmutabilityPolicy-BlobRequestConditions-Duration-Context
+    }
+
+    /**
+     * Code snippet for {@link BlobClientBase#deleteImmutabilityPolicy()} and
+     * {@link BlobClientBase#deleteImmutabilityPolicyWithResponse(Duration, Context)}
+     */
+    public void deleteImmutabilityPolicy() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicy
+        client.deleteImmutabilityPolicy();
+        System.out.println("Completed immutability policy deletion.");
+        // END: com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicy
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicyWithResponse#Duration-Context
+        System.out.println("Delete immutability policy completed with status: "
+            + client.deleteImmutabilityPolicyWithResponse(timeout, new Context(key1, value1)).getStatusCode());
+        // END: com.azure.storage.blob.specialized.BlobClientBase.deleteImmutabilityPolicyWithResponse#Duration-Context
+    }
+
+    /**
+     * Code snippet for {@link BlobClientBase#setLegalHold(boolean)} and
+     * {@link BlobClientBase#setLegalHoldWithResponse(boolean, Duration, Context)}
+     */
+    public void setLegalHold() {
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.setLegalHold#boolean
+        System.out.println("Legal hold status: " + client.setLegalHold(true));
+        // END: com.azure.storage.blob.specialized.BlobClientBase.setLegalHold#boolean
+
+        // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.setLegalHoldWithResponse#boolean-Duration-Context
+        System.out.println("Legal hold status: " + client.setLegalHoldWithResponse(true, timeout,
+            new Context(key1, value1)));
+        // END: com.azure.storage.blob.specialized.BlobClientBase.setLegalHoldWithResponse#boolean-Duration-Context
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/APISpec.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/APISpec.groovy
index 65f283ca5a00..5cebc5661fa7 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/APISpec.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/APISpec.groovy
@@ -774,7 +774,7 @@ class APISpec extends StorageSpec {
     }
 
     def getPollingDuration(long liveTestDurationInMillis) {
-        return (env.testMode == TestMode.PLAYBACK) ? Duration.ofMillis(10) : Duration.ofMillis(liveTestDurationInMillis)
+        return (env.testMode == TestMode.PLAYBACK) ? Duration.ofMillis(1) : Duration.ofMillis(liveTestDurationInMillis)
     }
 
     def getPerCallVersionPolicy() {
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobServiceSasModelsTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobServiceSasModelsTest.groovy
index aceeea173203..2281d0e4e65a 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobServiceSasModelsTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobServiceSasModelsTest.groovy
@@ -38,23 +38,25 @@ class BlobServiceSasModelsTest extends Specification {
             .setListPermission(list)
             .setMovePermission(move)
             .setExecutePermission(execute)
+            .setImmutabilityPolicyPermission(setImmutabilityPolicy)
 
         expect:
         perms.toString() == expectedString
 
         where:
-        read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute || expectedString
-        true  | false | false  | false  | false | false         | false | false | false | false   || "r"
-        false | true  | false  | false  | false | false         | false | false | false | false   || "w"
-        false | false | true   | false  | false | false         | false | false | false | false   || "d"
-        false | false | false  | true   | false | false         | false | false | false | false   || "c"
-        false | false | false  | false  | true  | false         | false | false | false | false   || "a"
-        false | false | false  | false  | false | true          | false | false | false | false   || "x"
-        false | false | false  | false  | false | false         | true  | false | false | false   || "t"
-        false | false | false  | false  | false | false         | false | true  | false | false   || "l"
-        false | false | false  | false  | false | false         | false | false | true  | false   || "m"
-        false | false | false  | false  | false | false         | false | false | false | true    || "e"
-        true  | true  | true   | true   | true  | true          | true  | true  | true  | true    || "racwdxltme"
+        read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute | setImmutabilityPolicy || expectedString
+        true  | false | false  | false  | false | false         | false | false | false | false   | false                 || "r"
+        false | true  | false  | false  | false | false         | false | false | false | false   | false                 || "w"
+        false | false | true   | false  | false | false         | false | false | false | false   | false                 || "d"
+        false | false | false  | true   | false | false         | false | false | false | false   | false                 || "c"
+        false | false | false  | false  | true  | false         | false | false | false | false   | false                 || "a"
+        false | false | false  | false  | false | true          | false | false | false | false   | false                 || "x"
+        false | false | false  | false  | false | false         | true  | false | false | false   | false                 || "t"
+        false | false | false  | false  | false | false         | false | true  | false | false   | false                 || "l"
+        false | false | false  | false  | false | false         | false | false | true  | false   | false                 || "m"
+        false | false | false  | false  | false | false         | false | false | false | true    | false                 || "e"
+        false | false | false  | false  | false | false         | false | false | false | false   | true                  || "i"
+        true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true                  || "racwdxltmei"
     }
 
     @Unroll
@@ -73,21 +75,23 @@ class BlobServiceSasModelsTest extends Specification {
         perms.hasListPermission() == list
         perms.hasMovePermission() == move
         perms.hasExecutePermission() == execute
+        perms.hasImmutabilityPolicyPermission() == setImmutabilityPolicy
 
         where:
-        permString    || read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute
-        "r"           || true  | false | false  | false  | false | false         | false | false | false | false
-        "w"           || false | true  | false  | false  | false | false         | false | false | false | false
-        "d"           || false | false | true   | false  | false | false         | false | false | false | false
-        "c"           || false | false | false  | true   | false | false         | false | false | false | false
-        "a"           || false | false | false  | false  | true  | false         | false | false | false | false
-        "x"           || false | false | false  | false  | false | true          | false | false | false | false
-        "t"           || false | false | false  | false  | false | false         | true  | false | false | false
-        "l"           || false | false | false  | false  | false | false         | false | true  | false | false
-        "m"           || false | false | false  | false  | false | false         | false | false | true  | false
-        "e"           || false | false | false  | false  | false | false         | false | false | false | true
-        "racwdxltme"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true
-        "dtcxewlrma"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true
+        permString     || read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute | setImmutabilityPolicy
+        "r"            || true  | false | false  | false  | false | false         | false | false | false | false   | false
+        "w"            || false | true  | false  | false  | false | false         | false | false | false | false   | false
+        "d"            || false | false | true   | false  | false | false         | false | false | false | false   | false
+        "c"            || false | false | false  | true   | false | false         | false | false | false | false   | false
+        "a"            || false | false | false  | false  | true  | false         | false | false | false | false   | false
+        "x"            || false | false | false  | false  | false | true          | false | false | false | false   | false
+        "t"            || false | false | false  | false  | false | false         | true  | false | false | false   | false
+        "l"            || false | false | false  | false  | false | false         | false | true  | false | false   | false
+        "m"            || false | false | false  | false  | false | false         | false | false | true  | false   | false
+        "e"            || false | false | false  | false  | false | false         | false | false | false | true    | false
+        "i"            || false | false | false  | false  | false | false         | false | false | false | false   | true
+        "racwdxltmei"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true
+        "dtcxiewlrma"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true
     }
 
     def "BlobSASPermissions parse IA"() {
@@ -120,23 +124,25 @@ class BlobServiceSasModelsTest extends Specification {
             .setTagsPermission(tags)
             .setMovePermission(move)
             .setExecutePermission(execute)
+            .setImmutabilityPolicyPermission(setImmutabilityPolicy)
 
         expect:
         perms.toString() == expectedString
 
         where:
-        read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute || expectedString
-        true  | false | false  | false  | false | false         | false | false | false | false   || "r"
-        false | true  | false  | false  | false | false         | false | false | false | false   || "w"
-        false | false | true   | false  | false | false         | false | false | false | false   || "d"
-        false | false | false  | true   | false | false         | false | false | false | false   || "c"
-        false | false | false  | false  | true  | false         | false | false | false | false   || "a"
-        false | false | false  | false  | false | true          | false | false | false | false   || "x"
-        false | false | false  | false  | false | false         | true  | false | false | false   || "t"
-        false | false | false  | false  | false | false         | false | true  | false | false   || "l"
-        false | false | false  | false  | false | false         | false | false | true  | false   || "m"
-        false | false | false  | false  | false | false         | false | false | false | true    || "e"
-        true  | true  | true   | true   | true  | true          | true  | true  | true  | true    || "racwdxltme"
+        read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute | setImmutabilityPolicy   || expectedString
+        true  | false | false  | false  | false | false         | false | false | false | false   | false                   || "r"
+        false | true  | false  | false  | false | false         | false | false | false | false   | false                   || "w"
+        false | false | true   | false  | false | false         | false | false | false | false   | false                   || "d"
+        false | false | false  | true   | false | false         | false | false | false | false   | false                   || "c"
+        false | false | false  | false  | true  | false         | false | false | false | false   | false                   || "a"
+        false | false | false  | false  | false | true          | false | false | false | false   | false                   || "x"
+        false | false | false  | false  | false | false         | true  | false | false | false   | false                   || "t"
+        false | false | false  | false  | false | false         | false | true  | false | false   | false                   || "l"
+        false | false | false  | false  | false | false         | false | false | true  | false   | false                   || "m"
+        false | false | false  | false  | false | false         | false | false | false | true    | false                   || "e"
+        false | false | false  | false  | false | false         | false | false | false | false   | true                    || "i"
+        true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true                    || "racwdxltmei"
     }
 
     @Unroll
@@ -155,21 +161,23 @@ class BlobServiceSasModelsTest extends Specification {
         perms.hasListPermission() == list
         perms.hasMovePermission() == move
         perms.hasExecutePermission() == execute
+        perms.hasImmutabilityPolicyPermission() == setImmutabilityPolicy
 
         where:
-        permString    || read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute
-        "r"           || true  | false | false  | false  | false | false         | false | false | false | false
-        "w"           || false | true  | false  | false  | false | false         | false | false | false | false
-        "d"           || false | false | true   | false  | false | false         | false | false | false | false
-        "c"           || false | false | false  | true   | false | false         | false | false | false | false
-        "a"           || false | false | false  | false  | true  | false         | false | false | false | false
-        "x"           || false | false | false  | false  | false | true          | false | false | false | false
-        "t"           || false | false | false  | false  | false | false         | true  | false | false | false
-        "l"           || false | false | false  | false  | false | false         | false | true  | false | false
-        "m"           || false | false | false  | false  | false | false         | false | false | true  | false
-        "e"           || false | false | false  | false  | false | false         | false | false | false | true
-        "racwdxltme"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true
-        "dtcxewlrma"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true
+        permString     || read  | write | delete | create | add   | deleteVersion | tags  | list  | move  | execute | setImmutabilityPolicy
+        "r"            || true  | false | false  | false  | false | false         | false | false | false | false   | false
+        "w"            || false | true  | false  | false  | false | false         | false | false | false | false   | false
+        "d"            || false | false | true   | false  | false | false         | false | false | false | false   | false
+        "c"            || false | false | false  | true   | false | false         | false | false | false | false   | false
+        "a"            || false | false | false  | false  | true  | false         | false | false | false | false   | false
+        "x"            || false | false | false  | false  | false | true          | false | false | false | false   | false
+        "t"            || false | false | false  | false  | false | false         | true  | false | false | false   | false
+        "l"            || false | false | false  | false  | false | false         | false | true  | false | false   | false
+        "m"            || false | false | false  | false  | false | false         | false | false | true  | false   | false
+        "e"            || false | false | false  | false  | false | false         | false | false | false | true    | false
+        "i"            || false | false | false  | false  | false | false         | false | false | false | false   | true
+        "racwdxltmei"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true
+        "dticxewlrma"  || true  | true  | true   | true   | true  | true          | true  | true  | true  | true    | true
     }
 
     def "ContainerSASPermissions parse IA"() {
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTest.groovy
index af5dacfac3a0..88d71669d3d4 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKNTest.groovy
@@ -1,6 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.azure.storage.blob
 
-import com.azure.core.test.TestMode
 import com.azure.storage.blob.models.BlobContainerEncryptionScope
 import com.azure.storage.blob.models.BlobItem
 import com.azure.storage.blob.models.BlobStorageException
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKTest.groovy
index aa158b5a79ce..01ae2cdf01c7 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/CPKTest.groovy
@@ -1,7 +1,8 @@
-package com.azure.storage.blob
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
+package com.azure.storage.blob
 
-import com.azure.core.test.TestMode
 import com.azure.storage.blob.models.CustomerProvidedKey
 import com.azure.storage.blob.models.PageRange
 import com.azure.storage.blob.sas.BlobSasPermission
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
new file mode 100644
index 000000000000..aaf441258acd
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
@@ -0,0 +1,683 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob
+
+import com.azure.core.credential.TokenCredential
+import com.azure.core.http.HttpHeaders
+import com.azure.core.http.HttpMethod
+import com.azure.core.http.HttpPipeline
+import com.azure.core.http.HttpPipelineBuilder
+import com.azure.core.http.HttpRequest
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy
+import com.azure.core.test.TestMode
+import com.azure.identity.EnvironmentCredentialBuilder
+import com.azure.storage.blob.models.BlobErrorCode
+import com.azure.storage.blob.models.BlobImmutabilityPolicy
+import com.azure.storage.blob.models.BlobImmutabilityPolicyMode
+import com.azure.storage.blob.models.BlobListDetails
+import com.azure.storage.blob.models.BlobRequestConditions
+import com.azure.storage.blob.models.BlobStorageException
+import com.azure.storage.blob.models.LeaseStateType
+import com.azure.storage.blob.models.ListBlobContainersOptions
+import com.azure.storage.blob.models.ListBlobsOptions
+import com.azure.storage.blob.models.ParallelTransferOptions
+import com.azure.storage.blob.models.PublicAccessType
+import com.azure.storage.blob.options.AppendBlobCreateOptions
+import com.azure.storage.blob.options.BlobBeginCopyOptions
+import com.azure.storage.blob.options.BlobBreakLeaseOptions
+import com.azure.storage.blob.options.BlobCopyFromUrlOptions
+import com.azure.storage.blob.options.BlobParallelUploadOptions
+import com.azure.storage.blob.options.BlockBlobCommitBlockListOptions
+import com.azure.storage.blob.options.BlockBlobSimpleUploadOptions
+import com.azure.storage.blob.options.PageBlobCreateOptions
+import com.azure.storage.blob.sas.BlobContainerSasPermission
+import com.azure.storage.blob.sas.BlobSasPermission
+import com.azure.storage.blob.sas.BlobServiceSasSignatureValues
+import com.azure.storage.common.sas.AccountSasPermission
+import com.azure.storage.common.sas.AccountSasResourceType
+import com.azure.storage.common.sas.AccountSasService
+import com.azure.storage.common.sas.AccountSasSignatureValues
+import com.azure.storage.common.test.shared.extensions.LiveOnly
+import com.azure.storage.common.test.shared.extensions.RequiredServiceVersion
+import com.fasterxml.jackson.databind.ObjectMapper
+import reactor.core.publisher.Flux
+import spock.lang.ResourceLock
+import spock.lang.Unroll
+
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
+import java.time.Duration
+import java.time.temporal.ChronoUnit
+
+@ResourceLock("ManagementPlaneThrottling")
+class ImmutableStorageWithVersioningTest extends APISpec {
+
+    private BlobContainerClient vlwContainer;
+    private BlobClient vlwBlob
+    private String accountName = env.primaryAccount.name
+    private String containerName
+    private String resourceGroupName = "XClient"
+    private String subscriptionId = "ba45b233-e2ef-4169-8808-49eb0d8eba0d"
+    private String apiVersion = "2021-04-01"
+    private TokenCredential credential = new EnvironmentCredentialBuilder().build()
+    private BearerTokenAuthenticationPolicy credentialPolicy = new BearerTokenAuthenticationPolicy(credential, "https://management.azure.com/.default")
+
+    def setup() {
+        containerName = generateContainerName()
+
+        if (env.testMode != TestMode.PLAYBACK) {
+            String url = String.format("https://management.azure.com/subscriptions/%s/resourceGroups/%s/providers/"
+                + "Microsoft.Storage/storageAccounts/%s/blobServices/default/containers/%s?api-version=%s", subscriptionId,
+                resourceGroupName, accountName, containerName, apiVersion)
+            HttpPipeline httpPipeline = new HttpPipelineBuilder()
+                .policies(credentialPolicy)
+                .httpClient(getHttpClient())
+                .build()
+
+            def immutableStorageWithVersioning = new ImmutableStorageWithVersioning()
+            immutableStorageWithVersioning.enabled = true
+            def properties = new Properties()
+            properties.immutableStorageWithVersioning = immutableStorageWithVersioning
+            def body = new Body()
+            body.id = String.format("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Storage/storageAccounts/"
+                + "%s/blobServices/default/containers/%s", subscriptionId, resourceGroupName, accountName, containerName)
+            body.name = containerName
+            body.type = "Microsoft.Storage/storageAccounts/blobServices/containers"
+            body.properties = properties
+
+            String serializedBody = new ObjectMapper().writeValueAsString(body)
+
+            httpPipeline.send(new HttpRequest(HttpMethod.PUT, new URL(url), new HttpHeaders(),
+                Flux.just(ByteBuffer.wrap(serializedBody.getBytes(StandardCharsets.UTF_8)))))
+                .block()
+        }
+
+        vlwContainer = primaryBlobServiceClient.getBlobContainerClient(containerName)
+        vlwBlob = vlwContainer.getBlobClient(generateBlobName())
+        vlwBlob.upload(new ByteArrayInputStream(new byte[0]), 0)
+    }
+
+    private final class Body {
+        public String id
+        public String name
+        public String type
+        public Properties properties
+    }
+    private final class Properties {
+        public ImmutableStorageWithVersioning immutableStorageWithVersioning
+    }
+    private final class ImmutableStorageWithVersioning {
+        public boolean enabled
+    }
+
+    def cleanup() {
+
+        if (env.testMode != TestMode.PLAYBACK) {
+            HttpPipeline httpPipeline = new HttpPipelineBuilder()
+                .policies(credentialPolicy)
+                .httpClient(getHttpClient())
+                .build()
+            def cleanupClient = new BlobServiceClientBuilder()
+                .httpClient(getHttpClient())
+                .credential(env.primaryAccount.credential)
+                .endpoint(env.primaryAccount.blobEndpoint)
+                .buildClient()
+
+            def options = new ListBlobContainersOptions().setPrefix(namer.getResourcePrefix())
+            for (def container : cleanupClient.listBlobContainers(options, null)) {
+                def containerClient = cleanupClient.getBlobContainerClient(container.getName())
+
+                if (container.getProperties().getLeaseState() == LeaseStateType.LEASED) {
+                    createLeaseClient(containerClient).breakLeaseWithResponse(new BlobBreakLeaseOptions().setBreakPeriod(Duration.ofSeconds(0)), null, null)
+                }
+                if (container.getProperties().isImmutableStorageWithVersioningEnabled()) {
+                    options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveImmutabilityPolicy(true).setRetrieveLegalHold(true))
+                    for (def blob: containerClient.listBlobs(options, null)) {
+                        def blobClient = containerClient.getBlobClient(blob.getName())
+                        if (blob.getProperties().hasLegalHold()) {
+                            blobClient.setLegalHold(false)
+                        }
+                        if (blob.getProperties().getImmutabilityPolicyMode() != null) {
+                            sleepIfRecord(5 * 1000)
+                            blobClient.deleteImmutabilityPolicy()
+                        }
+                        blobClient.delete()
+                    }
+                }
+
+                String url = String.format("https://management.azure.com/subscriptions/%s/resourceGroups/%s/providers/"
+                    + "Microsoft.Storage/storageAccounts/%s/blobServices/default/containers/%s?api-version=%s", subscriptionId,
+                    resourceGroupName, accountName, container.getName(), apiVersion)
+                httpPipeline.send(new HttpRequest(HttpMethod.DELETE, new URL(url), new HttpHeaders(), Flux.empty()))
+                    .block()
+            }
+        }
+
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "set immutability policy min"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+
+        when:
+        def response = vlwBlob.setImmutabilityPolicy(immutabilityPolicy)
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED == response.getPolicyMode()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    def "set immutability policy"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(policyMode)
+
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+
+        when: "set immutability policy"
+        def response = vlwBlob.setImmutabilityPolicyWithResponse(immutabilityPolicy, null, null, null).getValue()
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getExpiryTime()
+        policyMode == response.getPolicyMode()
+
+        when: "get properties"
+        response = vlwBlob.getProperties()
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        policyMode.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+
+        when: "list blob"
+        def options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveImmutabilityPolicy(true).setRetrieveLegalHold(true))
+        response = vlwContainer.listBlobs(options, null).iterator()
+
+        then:
+        def blob = response.next()
+        !response.hasNext()
+        blob.getName() == vlwBlob.getBlobName()
+        expectedImmutabilityPolicyExpiry == blob.getProperties().getImmutabilityPolicy().getExpiryTime()
+        policyMode.toString() == blob.getProperties().getImmutabilityPolicy().getPolicyMode().toString()
+
+
+        where:
+        policyMode                          || _
+        BlobImmutabilityPolicyMode.UNLOCKED || _
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    def "set immutability policy AC"() {
+        setup:
+        def bac = new BlobRequestConditions()
+            .setIfUnmodifiedSince(unmodified)
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        def response = vlwBlob.setImmutabilityPolicyWithResponse(immutabilityPolicy, bac, null, null)
+
+        then:
+        response.getStatusCode() == 200
+
+        where:
+        unmodified || _
+        null       || _
+        newDate    || _
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "set immutability policy AC fail"() {
+        setup:
+        def bac = new BlobRequestConditions()
+            .setIfUnmodifiedSince(oldDate)
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        vlwBlob.setImmutabilityPolicyWithResponse(immutabilityPolicy, bac, null, null)
+
+        then:
+        def e = thrown(BlobStorageException)
+        e.getErrorCode() == BlobErrorCode.CONDITION_NOT_MET
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "set immutability policy error"() {
+        setup:
+        def blob = vlwContainer.getBlobClient(generateBlobName())
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        blob.setImmutabilityPolicyWithResponse(immutabilityPolicy, null, null, null)
+
+        then:
+        def e = thrown(BlobStorageException)
+        e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "set immutability policy IA"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.MUTABLE)
+
+        when:
+        vlwBlob.setImmutabilityPolicyWithResponse(immutabilityPolicy, null, null, null)
+
+        then:
+        def e = thrown(IllegalArgumentException)
+        e.getMessage() == "immutabilityPolicy.policyMode must be Locked or Unlocked"
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "delete immutability policy min"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+        vlwBlob.setImmutabilityPolicy(immutabilityPolicy)
+
+        when:
+        vlwBlob.deleteImmutabilityPolicy()
+
+        then:
+        def properties = vlwBlob.getProperties()
+        properties.getImmutabilityPolicy().getPolicyMode() == null
+        properties.getImmutabilityPolicy().getExpiryTime() == null
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "delete immutability policy"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+        vlwBlob.setImmutabilityPolicy(immutabilityPolicy)
+
+        when:
+        vlwBlob.deleteImmutabilityPolicyWithResponse(null, null)
+
+        then:
+        def properties = vlwBlob.getProperties()
+        properties.getImmutabilityPolicy().getPolicyMode() == null
+        properties.getImmutabilityPolicy().getExpiryTime() == null
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "delete immutability policy error"() {
+        setup:
+        def blob = vlwContainer.getBlobClient(generateBlobName())
+
+        when:
+        blob.deleteImmutabilityPolicyWithResponse(null, null)
+
+        then:
+        def e = thrown(BlobStorageException)
+        e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    def "set legal hold min"() {
+        when:
+        def response = vlwBlob.setLegalHold(legalHold)
+
+        then:
+        response.hasLegalHold() == legalHold
+
+        where:
+        legalHold || _
+        true      || _
+        false     || _
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    def "set legal hold"() {
+        when: "set legal hold"
+        def response = vlwBlob.setLegalHoldWithResponse(legalHold, null, null)
+
+        then:
+        response.getValue().hasLegalHold() == legalHold
+
+        when: "get properties"
+        response = vlwBlob.getProperties()
+
+        then:
+        legalHold == response.hasLegalHold()
+
+        when: "list blob"
+        def options = new ListBlobsOptions().setDetails(new BlobListDetails().setRetrieveImmutabilityPolicy(true).setRetrieveLegalHold(true))
+        response = vlwContainer.listBlobs(options, null).iterator()
+
+        then:
+        def blob = response.next()
+        !response.hasNext()
+        blob.getName() == vlwBlob.getBlobName()
+        legalHold == blob.getProperties().hasLegalHold()
+
+        where:
+        legalHold || _
+        true      || _
+        false     || _
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "set legal hold error"() {
+        setup:
+        def blob = vlwContainer.getBlobClient(generateBlobName())
+
+        when:
+        blob.setLegalHoldWithResponse(false, null, null)
+
+        then:
+        def e = thrown(BlobStorageException)
+        e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "container properties"() {
+        when:
+        def response = vlwContainer.getProperties()
+
+        then:
+        response.isImmutableStorageWithVersioningEnabled()
+
+        when:
+        response = vlwContainer.getServiceClient().listBlobContainers(new ListBlobContainersOptions().setPrefix(vlwContainer.getBlobContainerName()), null).iterator()
+
+        then:
+        def container = response.next()
+        !response.hasNext()
+        container.getProperties().isImmutableStorageWithVersioningEnabled()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "append blob create"() {
+        setup:
+        def appendBlob = vlwContainer.getBlobClient(generateBlobName()).getAppendBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        appendBlob.createWithResponse(new AppendBlobCreateOptions()
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = appendBlob.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "page blob create"() {
+        setup:
+        def pageBlob = vlwContainer.getBlobClient(generateBlobName()).getPageBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        pageBlob.createWithResponse(new PageBlobCreateOptions(512)
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = pageBlob.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "block blob commit block list"() {
+        setup:
+        def blockBlob = vlwBlob.getBlockBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        blockBlob.commitBlockListWithResponse(new BlockBlobCommitBlockListOptions(new ArrayList<String>())
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = blockBlob.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "block blob upload"() {
+        setup:
+        def blockBlob = vlwBlob.getBlockBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        blockBlob.uploadWithResponse(new BlockBlobSimpleUploadOptions(data.defaultFlux, data.defaultDataSize)
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = blockBlob.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    @LiveOnly
+    def "blob upload"() {
+        setup:
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        vlwBlob.uploadWithResponse(new BlobParallelUploadOptions(data.defaultFlux)
+            .setParallelTransferOptions(new ParallelTransferOptions().setBlockSizeLong(blockSize).setMaxSingleUploadSizeLong(blockSize))
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = vlwBlob.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+
+        where:
+        blockSize || _
+        1         || _ // Tests multi-part upload
+        null      || _ // Tests single shot upload
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "sync copy"() {
+        setup:
+        vlwContainer.setAccessPolicy(PublicAccessType.CONTAINER, null)
+        def destination = vlwContainer.getBlobClient(generateBlobName()).getBlockBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        destination.copyFromUrlWithResponse(new BlobCopyFromUrlOptions(vlwBlob.getBlobUrl())
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true), null, null)
+
+        then:
+        def response = destination.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+
+        cleanup:
+        vlwContainer.setAccessPolicy(null, null)
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "copy"() {
+        setup:
+        def destination = vlwContainer.getBlobClient(generateBlobName()).getBlockBlobClient()
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        def poller = destination.beginCopy(new BlobBeginCopyOptions(vlwBlob.getBlobUrl())
+            .setImmutabilityPolicy(immutabilityPolicy)
+            .setLegalHold(true).setPollInterval(getPollingDuration(1000)))
+        poller.waitForCompletion()
+
+        then:
+        def response = destination.getProperties()
+        expectedImmutabilityPolicyExpiry == response.getImmutabilityPolicy().getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getImmutabilityPolicy().getPolicyMode().toString()
+        response.hasLegalHold()
+    }
+
+    /* SAS tests */
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "account sas"() {
+        setup:
+        def expiryTime = namer.getUtcNow().plusDays(1)
+        def permissions = AccountSasPermission.parse("rwdxlacuptfi")
+        def service = new AccountSasService().setBlobAccess(true)
+        def resource = new AccountSasResourceType().setObject(true).setContainer(true)
+        def sasValues = new AccountSasSignatureValues(expiryTime, permissions, service, resource)
+        expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+        def sas = primaryBlobServiceClient.generateAccountSas(sasValues)
+        def client = getBlobClient(sas, vlwContainer.getBlobContainerUrl(), vlwBlob.getBlobName())
+
+        when:
+        def response = client.setImmutabilityPolicy(immutabilityPolicy)
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getPolicyMode().toString()
+
+        when:
+        response = client.setLegalHold(false)
+
+        then:
+        !response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "container sas"() {
+        setup:
+        def expiryTime = namer.getUtcNow().plusDays(1)
+        def permissions = BlobContainerSasPermission.parse("racwdxltmei")
+        def sasValues = new BlobServiceSasSignatureValues(expiryTime, permissions)
+        expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+        def sas = vlwContainer.generateSas(sasValues)
+        def client = getBlobClient(sas, vlwContainer.getBlobContainerUrl(), vlwBlob.getBlobName())
+
+        when:
+        def response = client.setImmutabilityPolicy(immutabilityPolicy)
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getPolicyMode().toString()
+
+        when:
+        response = client.setLegalHold(false)
+
+        then:
+        !response.hasLegalHold()
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "blob sas"() {
+        setup:
+        def expiryTime = namer.getUtcNow().plusDays(1)
+        def permissions = BlobSasPermission.parse("racwdxtlmei")
+        def sasValues = new BlobServiceSasSignatureValues(expiryTime, permissions)
+        expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        // The service rounds Immutability Policy Expiry to the nearest second.
+        def expectedImmutabilityPolicyExpiry = expiryTime.truncatedTo(ChronoUnit.SECONDS)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+        def sas = vlwBlob.generateSas(sasValues)
+        def client = getBlobClient(sas, vlwContainer.getBlobContainerUrl(), vlwBlob.getBlobName())
+
+        when:
+        def response = client.setImmutabilityPolicy(immutabilityPolicy)
+
+        then:
+        expectedImmutabilityPolicyExpiry == response.getExpiryTime()
+        BlobImmutabilityPolicyMode.UNLOCKED.toString() == response.getPolicyMode().toString()
+
+        when:
+        response = client.setLegalHold(false)
+
+        then:
+        !response.hasLegalHold()
+    }
+
+}
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAccountSas.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAccountSas.json
new file mode 100644
index 000000000000..e9f77df7757a
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAccountSas.json
@@ -0,0 +1,92 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b3e29cea0b3e29cea2626041815d31a7ca8994aec877?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "14bcfc1d-10c3-405b-9616-8bf0cde241fe"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D921461D6D270A",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:07 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac30a7-501e-0090-672e-53e0ac000000",
+      "x-ms-client-request-id" : "14bcfc1d-10c3-405b-9616-8bf0cde241fe",
+      "Date" : "Thu, 27 May 2021 19:32:06 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b3e29cea1b3e29cea262102965f662e4767134970929/b3e29cea2b3e29cea26225384ffb25649a66b4fa6855",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fae88e85-9e7a-496d-b4e0-72a072eb8fae",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:07 GMT",
+      "x-ms-version-id" : "2021-05-27T19:32:07.9900351Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:32:07 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D921461DBBA6BF",
+      "x-ms-request-id" : "72ac3102-501e-0090-212e-53e0ac000000",
+      "x-ms-client-request-id" : "fae88e85-9e7a-496d-b4e0-72a072eb8fae"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b3e29cea1b3e29cea262102965f662e4767134970929/b3e29cea2b3e29cea26225384ffb25649a66b4fa6855?comp=immutabilityPolicies&sv=2020-10-02&ss=b&srt=co&se=2021-05-28T19%3A32%3A08Z&sp=rwdxlacuptfi&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e3bda891-4f63-44f9-bdee-33bbc4d0b3b3"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:32:10 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "72ac3124-501e-0090-3e2e-53e0ac000000",
+      "x-ms-client-request-id" : "e3bda891-4f63-44f9-bdee-33bbc4d0b3b3",
+      "Date" : "Thu, 27 May 2021 19:32:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/b3e29cea1b3e29cea262102965f662e4767134970929/b3e29cea2b3e29cea26225384ffb25649a66b4fa6855?comp=legalhold&sv=2020-10-02&ss=b&srt=co&se=2021-05-28T19%3A32%3A08Z&sp=rwdxlacuptfi&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "775183b6-1d16-469c-9066-c3069caecfb6"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "x-ms-request-id" : "72ac313e-501e-0090-522e-53e0ac000000",
+      "x-ms-client-request-id" : "775183b6-1d16-469c-9066-c3069caecfb6",
+      "Date" : "Thu, 27 May 2021 19:32:07 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "b3e29cea0b3e29cea2626041815d31a7ca8994aec877", "b3e29cea1b3e29cea262102965f662e4767134970929", "b3e29cea2b3e29cea26225384ffb25649a66b4fa6855", "2021-05-27T19:32:08.903747700Z", "2021-05-27T19:32:08.961483200Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAppendBlobCreate.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAppendBlobCreate.json
new file mode 100644
index 000000000000..27073964bb5f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestAppendBlobCreate.json
@@ -0,0 +1,108 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3acd3d2703acd3d2728d59408c3c96ff9ca2b416cacd?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1584034e-365a-4a73-9004-14d9ae50b4ae"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F522C770",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:59 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae7b92-a01e-002d-3a2e-5369b1000000",
+      "x-ms-client-request-id" : "1584034e-365a-4a73-9004-14d9ae50b4ae",
+      "Date" : "Thu, 27 May 2021 19:30:59 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3acd3d2713acd3d2728d084871af8b3daca1444f8941/3acd3d2723acd3d2728d139092bed77e0a1c343f7bb0",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "35c7e1d5-ec62-468d-9527-f4b3b734d897",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:00 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:00.4770663Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:00 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145F57DFD67",
+      "x-ms-request-id" : "6fae7bfd-a01e-002d-122e-5369b1000000",
+      "x-ms-client-request-id" : "35c7e1d5-ec62-468d-9527-f4b3b734d897"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3acd3d2713acd3d2728d084871af8b3daca1444f8941/3acd3d2733acd3d2728d86294aecd491f72994ce28d7",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3b14f7b2-52d0-415f-b161-c86959d97f58"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F591FE3A",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:00 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:00.6081594Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae7c06-a01e-002d-1b2e-5369b1000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "3b14f7b2-52d0-415f-b161-c86959d97f58",
+      "Date" : "Thu, 27 May 2021 19:31:00 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/3acd3d2713acd3d2728d084871af8b3daca1444f8941/3acd3d2733acd3d2728d86294aecd491f72994ce28d7",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4141d73a-c4bb-489a-9b2a-781e0fc59f2b"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:31:03 GMT",
+      "x-ms-lease-state" : "available",
+      "x-ms-blob-committed-block-count" : "0",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:00 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:00.6081594Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:00 GMT",
+      "x-ms-blob-type" : "AppendBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:00 GMT",
+      "eTag" : "0x8D92145F591FE3A",
+      "x-ms-request-id" : "6fae7c1b-a01e-002d-262e-5369b1000000",
+      "x-ms-client-request-id" : "4141d73a-c4bb-489a-9b2a-781e0fc59f2b",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "3acd3d2703acd3d2728d59408c3c96ff9ca2b416cacd", "3acd3d2713acd3d2728d084871af8b3daca1444f8941", "3acd3d2723acd3d2728d139092bed77e0a1c343f7bb0", "3acd3d2733acd3d2728d86294aecd491f72994ce28d7", "2021-05-27T19:31:01.400830300Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlobSas.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlobSas.json
new file mode 100644
index 000000000000..97f9a20b9a2f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlobSas.json
@@ -0,0 +1,92 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/63d094ba063d094ba06a426019282cc2a0828436da12?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a9c65418-d204-4279-86d2-dfe3bad38288"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9214625B1602C",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:21 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac3c7a-501e-0090-5c2f-53e0ac000000",
+      "x-ms-client-request-id" : "a9c65418-d204-4279-86d2-dfe3bad38288",
+      "Date" : "Thu, 27 May 2021 19:32:20 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/63d094ba163d094ba06a741161e86f18e44904e199c3/63d094ba263d094ba06a02168a3a3bebddffa4bf7a64",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bb5a8d68-ad12-4aff-ada5-075e5b536c75",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:21 GMT",
+      "x-ms-version-id" : "2021-05-27T19:32:21.9069192Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:32:21 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D9214626073308",
+      "x-ms-request-id" : "72ac3ce7-501e-0090-302f-53e0ac000000",
+      "x-ms-client-request-id" : "bb5a8d68-ad12-4aff-ada5-075e5b536c75"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/63d094ba163d094ba06a741161e86f18e44904e199c3/63d094ba263d094ba06a02168a3a3bebddffa4bf7a64?comp=immutabilityPolicies&sv=2020-10-02&se=2021-05-28T19%3A32%3A22Z&sr=b&sp=racwdxltmei&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3f108c91-d35b-47c6-b6b7-cf5093713786"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:32:24 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "72ac3cfb-501e-0090-412f-53e0ac000000",
+      "x-ms-client-request-id" : "3f108c91-d35b-47c6-b6b7-cf5093713786",
+      "Date" : "Thu, 27 May 2021 19:32:21 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/63d094ba163d094ba06a741161e86f18e44904e199c3/63d094ba263d094ba06a02168a3a3bebddffa4bf7a64?comp=legalhold&sv=2020-10-02&se=2021-05-28T19%3A32%3A22Z&sr=b&sp=racwdxltmei&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fa29218b-a6ca-45b9-a570-0a978e142412"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "x-ms-request-id" : "72ac3d0d-501e-0090-522f-53e0ac000000",
+      "x-ms-client-request-id" : "fa29218b-a6ca-45b9-a570-0a978e142412",
+      "Date" : "Thu, 27 May 2021 19:32:21 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "63d094ba063d094ba06a426019282cc2a0828436da12", "63d094ba163d094ba06a741161e86f18e44904e199c3", "63d094ba263d094ba06a02168a3a3bebddffa4bf7a64", "2021-05-27T19:32:22.823801200Z", "2021-05-27T19:32:22.840795800Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobCommitBlockList.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobCommitBlockList.json
new file mode 100644
index 000000000000..cdff28d55017
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobCommitBlockList.json
@@ -0,0 +1,112 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0d73644400d7364443cc83999b6206e8df4f64657b82?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ee051c03-d731-43ac-9efe-ab1ef517b3f1"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D921460AEBBD0A",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:36 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac1421-501e-0090-7b2e-53e0ac000000",
+      "x-ms-client-request-id" : "ee051c03-d731-43ac-9efe-ab1ef517b3f1",
+      "Date" : "Thu, 27 May 2021 19:31:35 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0d73644410d7364443cc189079debf198110c435eaca/0d73644420d7364443cc62709f00d9176b9494fa1a48",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7b4d4a30-689c-4c45-b808-07f480741bbf",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:37 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:37.0370424Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:36 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D921460B489978",
+      "x-ms-request-id" : "72ac1490-501e-0090-4f2e-53e0ac000000",
+      "x-ms-client-request-id" : "7b4d4a30-689c-4c45-b808-07f480741bbf"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0d73644410d7364443cc189079debf198110c435eaca/0d73644420d7364443cc62709f00d9176b9494fa1a48?comp=blocklist",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e017e175-17fa-4c1d-a2ac-7c136d81ece6",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "p1vsGtjjPsk=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:37 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:37.3042321Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:36 GMT",
+      "eTag" : "0x8D921460B711065",
+      "x-ms-request-id" : "72ac14fd-501e-0090-2b2e-53e0ac000000",
+      "x-ms-client-request-id" : "e017e175-17fa-4c1d-a2ac-7c136d81ece6"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0d73644410d7364443cc189079debf198110c435eaca/0d73644420d7364443cc62709f00d9176b9494fa1a48",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "286f7a1b-101d-49b7-a905-73241cd65fc6"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:37 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:37.3042321Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:37 GMT",
+      "eTag" : "0x8D921460B711065",
+      "x-ms-request-id" : "72ac150d-501e-0090-392e-53e0ac000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:31:37 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:31:39 GMT",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:36 GMT",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-client-request-id" : "286f7a1b-101d-49b7-a905-73241cd65fc6"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "0d73644400d7364443cc83999b6206e8df4f64657b82", "0d73644410d7364443cc189079debf198110c435eaca", "0d73644420d7364443cc62709f00d9176b9494fa1a48", "2021-05-27T19:31:37.959028Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobUpload.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobUpload.json
new file mode 100644
index 000000000000..2e444f4db97e
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestBlockBlobUpload.json
@@ -0,0 +1,114 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9f11288f09f11288ffcc2964735412cd5a1ba47af87b?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d62f00aa-13c8-41ea-91da-7f71d951ab93"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D921460F3B6E3A",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:43 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac1a5e-501e-0090-0c2e-53e0ac000000",
+      "x-ms-client-request-id" : "d62f00aa-13c8-41ea-91da-7f71d951ab93",
+      "Date" : "Thu, 27 May 2021 19:31:42 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9f11288f19f11288ffcc70202f4c27a8223cd482fa5f/9f11288f29f11288ffcc68929653e8cf5354a45c29ee",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "30b575a6-188c-435f-825d-5e9ab412b413",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:44 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:44.3222203Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:43 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D921460FA03ABB",
+      "x-ms-request-id" : "72ac1ade-501e-0090-712e-53e0ac000000",
+      "x-ms-client-request-id" : "30b575a6-188c-435f-825d-5e9ab412b413"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9f11288f19f11288ffcc70202f4c27a8223cd482fa5f/9f11288f29f11288ffcc68929653e8cf5354a45c29ee",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0883c007-5696-44f5-8e08-c573de3d327f",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "6RYQPwaVsyQ=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:44 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:44.4142842Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:43 GMT",
+      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
+      "eTag" : "0x8D921460FAE1FEA",
+      "x-ms-request-id" : "72ac1af8-501e-0090-042e-53e0ac000000",
+      "x-ms-client-request-id" : "0883c007-5696-44f5-8e08-c573de3d327f"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/9f11288f19f11288ffcc70202f4c27a8223cd482fa5f/9f11288f29f11288ffcc68929653e8cf5354a45c29ee",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "819965ff-ac5b-4b80-a1c7-50a7f085ef51"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "7",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:44 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:44.4142842Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:44 GMT",
+      "eTag" : "0x8D921460FAE1FEA",
+      "x-ms-request-id" : "72ac1b16-501e-0090-182e-53e0ac000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:31:44 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:31:47 GMT",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:43 GMT",
+      "Content-MD5" : "wh+Wm18D0z1D4E+PE252gg==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-client-request-id" : "819965ff-ac5b-4b80-a1c7-50a7f085ef51"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "9f11288f09f11288ffcc2964735412cd5a1ba47af87b", "9f11288f19f11288ffcc70202f4c27a8223cd482fa5f", "9f11288f29f11288ffcc68929653e8cf5354a45c29ee", "2021-05-27T19:31:45.236012400Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerProperties.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerProperties.json
new file mode 100644
index 000000000000..55d82875b5d4
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerProperties.json
@@ -0,0 +1,100 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/20b1648e020b1648e0e51941938b0cb5d545641ecad0?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "57c425db-f35b-40fc-9318-c5f44f57f6b4"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F3FE0F7F",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:57 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae7a29-a01e-002d-112e-5369b1000000",
+      "x-ms-client-request-id" : "57c425db-f35b-40fc-9318-c5f44f57f6b4",
+      "Date" : "Thu, 27 May 2021 19:30:57 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/20b1648e120b1648e0e5212131bc817ec08f4408ab64/20b1648e220b1648e0e547157668c96682a7944929f7",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1b9423f9-9a05-439c-946e-2572fcdf2900",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:58 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:58.6177449Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:58 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145F46247A9",
+      "x-ms-request-id" : "6fae7aaa-a01e-002d-732e-5369b1000000",
+      "x-ms-client-request-id" : "1b9423f9-9a05-439c-946e-2572fcdf2900"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/20b1648e120b1648e0e5212131bc817ec08f4408ab64?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "46ae6777-d646-42ff-ad02-5dc0497b4b79"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "x-ms-immutable-storage-with-versioning-enabled" : "true",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "x-ms-deny-encryption-scope-override" : "false",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:58 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-has-legal-hold" : "false",
+      "Date" : "Thu, 27 May 2021 19:30:58 GMT",
+      "x-ms-default-encryption-scope" : "$account-encryption-key",
+      "x-ms-has-immutability-policy" : "false",
+      "eTag" : "0x8D92145F450C477",
+      "x-ms-request-id" : "6fae7abf-a01e-002d-052e-5369b1000000",
+      "x-ms-client-request-id" : "46ae6777-d646-42ff-ad02-5dc0497b4b79"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net?comp=list&prefix=20b1648e120b1648e0e5212131bc817ec08f4408ab64",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a567e7b0-f46f-4c3d-abad-f824d542f789"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae7aca-a01e-002d-0e2e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\"><Prefix>20b1648e120b1648e0e5212131bc817ec08f4408ab64</Prefix><Containers><Container><Name>20b1648e120b1648e0e5212131bc817ec08f4408ab64</Name><Properties><Last-Modified>Thu, 27 May 2021 19:30:58 GMT</Last-Modified><Etag>\"0x8D92145F450C477\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold><ImmutableStorageWithVersioningEnabled>true</ImmutableStorageWithVersioningEnabled></Properties></Container></Containers><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "a567e7b0-f46f-4c3d-abad-f824d542f789",
+      "Date" : "Thu, 27 May 2021 19:30:58 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "20b1648e020b1648e0e51941938b0cb5d545641ecad0", "20b1648e120b1648e0e5212131bc817ec08f4408ab64", "20b1648e220b1648e0e547157668c96682a7944929f7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerSas.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerSas.json
new file mode 100644
index 000000000000..c5122dc94d01
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestContainerSas.json
@@ -0,0 +1,92 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5fca972505fca97256f966501f3191159df764d70b76?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7d441442-8beb-4908-ac46-91c0b1ab07f4"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D921462184317A",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:14 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac36ba-501e-0090-3a2e-53e0ac000000",
+      "x-ms-client-request-id" : "7d441442-8beb-4908-ac46-91c0b1ab07f4",
+      "Date" : "Thu, 27 May 2021 19:32:13 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5fca972515fca97256f915961d0f67ae1cfe3486a81f/5fca972525fca97256f955912e6f2cb59b63646b2815",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5fbdd76f-4232-4e6c-9485-cf656cb184a3",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:32:14 GMT",
+      "x-ms-version-id" : "2021-05-27T19:32:14.8829329Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:32:14 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D9214621D76C91",
+      "x-ms-request-id" : "72ac3712-501e-0090-012e-53e0ac000000",
+      "x-ms-client-request-id" : "5fbdd76f-4232-4e6c-9485-cf656cb184a3"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5fca972515fca97256f915961d0f67ae1cfe3486a81f/5fca972525fca97256f955912e6f2cb59b63646b2815?comp=immutabilityPolicies&sv=2020-10-02&se=2021-05-28T19%3A32%3A15Z&sr=c&sp=racwdxltmei&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6665cf74-1072-4fef-9129-0b203e7c671b"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:32:17 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "72ac3723-501e-0090-0e2e-53e0ac000000",
+      "x-ms-client-request-id" : "6665cf74-1072-4fef-9129-0b203e7c671b",
+      "Date" : "Thu, 27 May 2021 19:32:14 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/5fca972515fca97256f915961d0f67ae1cfe3486a81f/5fca972525fca97256f955912e6f2cb59b63646b2815?comp=legalhold&sv=2020-10-02&se=2021-05-28T19%3A32%3A15Z&sr=c&sp=racwdxltmei&sig=REDACTED",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "38eebf60-b5a1-40d6-ac2b-cf4e3f78395c"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "x-ms-request-id" : "72ac3731-501e-0090-182e-53e0ac000000",
+      "x-ms-client-request-id" : "38eebf60-b5a1-40d6-ac2b-cf4e3f78395c",
+      "Date" : "Thu, 27 May 2021 19:32:14 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "5fca972505fca97256f966501f3191159df764d70b76", "5fca972515fca97256f915961d0f67ae1cfe3486a81f", "5fca972525fca97256f955912e6f2cb59b63646b2815", "2021-05-27T19:32:15.796732500Z", "2021-05-27T19:32:15.821731300Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestCopy.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestCopy.json
new file mode 100644
index 000000000000..507ff6cf975f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestCopy.json
@@ -0,0 +1,159 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d59f871e0d59f871e88608595bb07ab5ca34e44d4910?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6d5abcf6-cf68-4137-a843-7aa00c3bacc3"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92146187753A0",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:59 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac2912-501e-0090-122e-53e0ac000000",
+      "x-ms-client-request-id" : "6d5abcf6-cf68-4137-a843-7aa00c3bacc3",
+      "Date" : "Thu, 27 May 2021 19:31:58 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e2d59f871e88601602ae6e26821b264666bd9",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c4e88e99-e92f-4085-a757-b55ac1c28135",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:59.6961403Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:58 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D9214618CA1A7B",
+      "x-ms-request-id" : "72ac2980-501e-0090-6c2e-53e0ac000000",
+      "x-ms-client-request-id" : "c4e88e99-e92f-4085-a757-b55ac1c28135"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e3d59f871e88613392aa9c0a46bba6488e82d",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "94ace7ed-38a2-4f92-8206-faa844f601b7"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-copy-id" : "d83afc8e-7ba5-4311-8a8b-289ae8c96b7d",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:59.8962822Z",
+      "retry-after" : "0",
+      "StatusCode" : "202",
+      "Date" : "Thu, 27 May 2021 19:31:59 GMT",
+      "eTag" : "0x8D9214618E87D6E",
+      "x-ms-copy-status" : "success",
+      "x-ms-request-id" : "72ac29a4-501e-0090-082e-53e0ac000000",
+      "x-ms-client-request-id" : "94ace7ed-38a2-4f92-8206-faa844f601b7"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e3d59f871e88613392aa9c0a46bba6488e82d",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b837b62e-3d75-440b-8158-bcf858a9c643"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:59.8962822Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "eTag" : "0x8D9214618E87D6E",
+      "x-ms-request-id" : "72ac2aa1-501e-0090-5d2e-53e0ac000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-copy-id" : "d83afc8e-7ba5-4311-8a8b-289ae8c96b7d",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:32:02 GMT",
+      "x-ms-copy-source" : "https://seanmcccanary3.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e2d59f871e88601602ae6e26821b264666bd9",
+      "x-ms-copy-progress" : "0/0",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:32:00 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-copy-completion-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-copy-status" : "success",
+      "x-ms-client-request-id" : "b837b62e-3d75-440b-8158-bcf858a9c643"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e3d59f871e88613392aa9c0a46bba6488e82d",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e1919beb-65ab-412d-95b9-9c4e29dc85e4"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:59.8962822Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "eTag" : "0x8D9214618E87D6E",
+      "x-ms-request-id" : "72ac2abf-501e-0090-752e-53e0ac000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-copy-id" : "d83afc8e-7ba5-4311-8a8b-289ae8c96b7d",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:32:02 GMT",
+      "x-ms-copy-source" : "https://seanmcccanary3.blob.core.windows.net/d59f871e1d59f871e88696273b789283c9d274fe7bab/d59f871e2d59f871e88601602ae6e26821b264666bd9",
+      "x-ms-copy-progress" : "0/0",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:32:00 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-copy-completion-time" : "Thu, 27 May 2021 19:31:59 GMT",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-copy-status" : "success",
+      "x-ms-client-request-id" : "e1919beb-65ab-412d-95b9-9c4e29dc85e4"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "d59f871e0d59f871e88608595bb07ab5ca34e44d4910", "d59f871e1d59f871e88696273b789283c9d274fe7bab", "d59f871e2d59f871e88601602ae6e26821b264666bd9", "d59f871e3d59f871e88613392aa9c0a46bba6488e82d", "2021-05-27T19:32:00.613943300Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicy.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicy.json
new file mode 100644
index 000000000000..5efd5e3fb636
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicy.json
@@ -0,0 +1,125 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a91327200a91327207cd77478567fec3cf8b84f6284b?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "29a6c8b9-9c0c-4fa9-868e-bd9c385bb88a"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145EB885EFD",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:43 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae6e71-a01e-002d-7e2e-5369b1000000",
+      "x-ms-client-request-id" : "29a6c8b9-9c0c-4fa9-868e-bd9c385bb88a",
+      "Date" : "Thu, 27 May 2021 19:30:43 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a91327201a91327207cd30720211e6ee9c333400d814/a91327202a91327207cd0421834d4f021930a4665a0f",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "96e0ec08-c245-43df-9a1e-9658df3e0134",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:44 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:44.4116548Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:44 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145EBEA9A44",
+      "x-ms-request-id" : "6fae6f21-a01e-002d-112e-5369b1000000",
+      "x-ms-client-request-id" : "96e0ec08-c245-43df-9a1e-9658df3e0134"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a91327201a91327207cd30720211e6ee9c333400d814/a91327202a91327207cd0421834d4f021930a4665a0f?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "038a3860-d6d1-4944-882e-39f18eb6a962"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:47 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae6f2f-a01e-002d-1e2e-5369b1000000",
+      "x-ms-client-request-id" : "038a3860-d6d1-4944-882e-39f18eb6a962",
+      "Date" : "Thu, 27 May 2021 19:30:44 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a91327201a91327207cd30720211e6ee9c333400d814/a91327202a91327207cd0421834d4f021930a4665a0f?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "190a6aba-4e42-4d6b-a61e-b00ba1fa27eb"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae6f3d-a01e-002d-292e-5369b1000000",
+      "x-ms-client-request-id" : "190a6aba-4e42-4d6b-a61e-b00ba1fa27eb",
+      "Date" : "Thu, 27 May 2021 19:30:44 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a91327201a91327207cd30720211e6ee9c333400d814/a91327202a91327207cd0421834d4f021930a4665a0f",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "251d8eaa-9f95-48f5-946d-1c7984e84a8b"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:30:44 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:44 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:44.4116548Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Thu, 27 May 2021 19:30:44 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:30:44 GMT",
+      "eTag" : "0x8D92145EBEA9A44",
+      "x-ms-request-id" : "6fae6f48-a01e-002d-332e-5369b1000000",
+      "x-ms-client-request-id" : "251d8eaa-9f95-48f5-946d-1c7984e84a8b",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "a91327200a91327207cd77478567fec3cf8b84f6284b", "a91327201a91327207cd30720211e6ee9c333400d814", "a91327202a91327207cd0421834d4f021930a4665a0f", "2021-05-27T19:30:45.334388200Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyError.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyError.json
new file mode 100644
index 000000000000..bae1619875c2
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyError.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/019d317f0019d317f610559030c97ae3c06864cdd9ca?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4f82ab18-b1aa-475f-8803-cbdca0c00901"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145ECC07B68",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:45 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae702a-a01e-002d-6f2e-5369b1000000",
+      "x-ms-client-request-id" : "4f82ab18-b1aa-475f-8803-cbdca0c00901",
+      "Date" : "Thu, 27 May 2021 19:30:45 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/019d317f1019d317f61063016d580a9a5a85641e29b9/019d317f2019d317f61027136e56c9fb3df5444f8960",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "44ff3b0e-e434-4b58-afb4-d792bb4560f9",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:46 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:46.3440281Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:46 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145ED117599",
+      "x-ms-request-id" : "6fae70a1-a01e-002d-542e-5369b1000000",
+      "x-ms-client-request-id" : "44ff3b0e-e434-4b58-afb4-d792bb4560f9"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/019d317f1019d317f61063016d580a9a5a85641e29b9/019d317f3019d317f61082993145c90efd94440dc838?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "214788a5-049e-4c94-8f76-6880dc758ee4"
+    },
+    "Response" : {
+      "content-length" : "216",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "BlobNotFound",
+      "retry-after" : "0",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "6fae70b0-a01e-002d-622e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>BlobNotFound</Code><Message>The specified blob does not exist.\nRequestId:6fae70b0-a01e-002d-622e-5369b1000000\nTime:2021-05-27T19:30:46.4107590Z</Message></Error>",
+      "x-ms-client-request-id" : "214788a5-049e-4c94-8f76-6880dc758ee4",
+      "Date" : "Thu, 27 May 2021 19:30:46 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "019d317f0019d317f610559030c97ae3c06864cdd9ca", "019d317f1019d317f61063016d580a9a5a85641e29b9", "019d317f2019d317f61027136e56c9fb3df5444f8960", "019d317f3019d317f61082993145c90efd94440dc838" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyMin.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyMin.json
new file mode 100644
index 000000000000..984c4813b5ec
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestDeleteImmutabilityPolicyMin.json
@@ -0,0 +1,125 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ff00eec20ff00eec27c31594172217a1edd3f425f841?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "65ba2212-eda3-4753-b67f-b540afd59fd5"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145EA61D1F8",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:41 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae6cb2-a01e-002d-082e-5369b1000000",
+      "x-ms-client-request-id" : "65ba2212-eda3-4753-b67f-b540afd59fd5",
+      "Date" : "Thu, 27 May 2021 19:30:41 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ff00eec21ff00eec27c302490adb0e220ce704e93bc1/ff00eec22ff00eec27c3036410d75f25eedcd4dbca52",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "de8b4a72-7826-4b41-a79f-ad60c415c867",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:42 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:42.4432559Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:42 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145EABE3FAF",
+      "x-ms-request-id" : "6fae6d44-a01e-002d-7f2e-5369b1000000",
+      "x-ms-client-request-id" : "de8b4a72-7826-4b41-a79f-ad60c415c867"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ff00eec21ff00eec27c302490adb0e220ce704e93bc1/ff00eec22ff00eec27c3036410d75f25eedcd4dbca52?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bdf3c0e8-aea6-49ec-beee-2725a49b9fad"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:45 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae6d60-a01e-002d-172e-5369b1000000",
+      "x-ms-client-request-id" : "bdf3c0e8-aea6-49ec-beee-2725a49b9fad",
+      "Date" : "Thu, 27 May 2021 19:30:42 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ff00eec21ff00eec27c302490adb0e220ce704e93bc1/ff00eec22ff00eec27c3036410d75f25eedcd4dbca52?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c15d53c1-718a-4bc2-87b0-f37840b8939d"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae6d68-a01e-002d-1f2e-5369b1000000",
+      "x-ms-client-request-id" : "c15d53c1-718a-4bc2-87b0-f37840b8939d",
+      "Date" : "Thu, 27 May 2021 19:30:42 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/ff00eec21ff00eec27c302490adb0e220ce704e93bc1/ff00eec22ff00eec27c3036410d75f25eedcd4dbca52",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5e44acd0-a70c-4018-ac8c-d3c934bf75ed"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:30:42 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:42 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:42.4432559Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Thu, 27 May 2021 19:30:42 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:30:42 GMT",
+      "eTag" : "0x8D92145EABE3FAF",
+      "x-ms-request-id" : "6fae6d80-a01e-002d-2e2e-5369b1000000",
+      "x-ms-client-request-id" : "5e44acd0-a70c-4018-ac8c-d3c934bf75ed",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "ff00eec20ff00eec27c31594172217a1edd3f425f841", "ff00eec21ff00eec27c302490adb0e220ce704e93bc1", "ff00eec22ff00eec27c3036410d75f25eedcd4dbca52", "2021-05-27T19:30:43.365659Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestPageBlobCreate.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestPageBlobCreate.json
new file mode 100644
index 000000000000..519ac639e70b
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestPageBlobCreate.json
@@ -0,0 +1,108 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e79977f40e79977f423d6785597fedba291924093a19?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "79449c3c-afa2-4904-85ba-72981c71350e"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F96380CC",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:07 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae8143-a01e-002d-5e2e-5369b1000000",
+      "x-ms-client-request-id" : "79449c3c-afa2-4904-85ba-72981c71350e",
+      "Date" : "Thu, 27 May 2021 19:31:06 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e79977f41e79977f423d86256c0e10cae126a4129a7c/e79977f42e79977f423d9924652e03092df4d4969b56",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "317fd6a0-b0d4-40bf-9511-39642b46b67c",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:29 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:29.4246329Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:28 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D9214606BF09B9",
+      "x-ms-request-id" : "72ac0cbc-501e-0090-592e-53e0ac000000",
+      "x-ms-client-request-id" : "317fd6a0-b0d4-40bf-9511-39642b46b67c"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e79977f41e79977f423d86256c0e10cae126a4129a7c/e79977f43e79977f423d5483050fb3a9c06d547e19d1",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "dca4eff8-8cde-427d-a1f2-eed801fd1d60"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9214606E16509",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:29 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:29.6497929Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac0d0c-501e-0090-1e2e-53e0ac000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "dca4eff8-8cde-427d-a1f2-eed801fd1d60",
+      "Date" : "Thu, 27 May 2021 19:31:28 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/e79977f41e79977f423d86256c0e10cae126a4129a7c/e79977f43e79977f423d5483050fb3a9c06d547e19d1",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e8422a80-b2ad-428d-a945-169b5e0226a9"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "512",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:31:32 GMT",
+      "x-ms-lease-state" : "available",
+      "x-ms-blob-sequence-number" : "0",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:29 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:29.6497929Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:29 GMT",
+      "x-ms-blob-type" : "PageBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:29 GMT",
+      "eTag" : "0x8D9214606E16509",
+      "x-ms-request-id" : "72ac0d29-501e-0090-3b2e-53e0ac000000",
+      "x-ms-client-request-id" : "e8422a80-b2ad-428d-a945-169b5e0226a9",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "e79977f40e79977f423d6785597fedba291924093a19", "e79977f41e79977f423d86256c0e10cae126a4129a7c", "e79977f42e79977f423d9924652e03092df4d4969b56", "e79977f43e79977f423d5483050fb3a9c06d547e19d1", "2021-05-27T19:31:30.367948100Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACFail.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACFail.json
new file mode 100644
index 000000000000..24d0aedb711f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACFail.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6f9714f106f9714f1e2e9999704236d02bf43499183d?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e9fd5d16-5f2d-4a65-976c-275e26a1ea9c"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145E703648C",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:36 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae67af-a01e-002d-522e-5369b1000000",
+      "x-ms-client-request-id" : "e9fd5d16-5f2d-4a65-976c-275e26a1ea9c",
+      "Date" : "Thu, 27 May 2021 19:30:35 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6f9714f116f9714f1e2e0906934f0e7cc2c6c41a2b61/6f9714f126f9714f1e2e723114916c5b2201b4df4a6f",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "41ae27b1-860b-41e5-8ecd-5297e3b64ee3",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:36 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:36.7472078Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:36 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145E758F2AF",
+      "x-ms-request-id" : "6fae6817-a01e-002d-2d2e-5369b1000000",
+      "x-ms-client-request-id" : "41ae27b1-860b-41e5-8ecd-5297e3b64ee3"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/6f9714f116f9714f1e2e0906934f0e7cc2c6c41a2b61/6f9714f126f9714f1e2e723114916c5b2201b4df4a6f?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e6a10127-1132-4def-8694-9ce96d7dab27"
+    },
+    "Response" : {
+      "content-length" : "253",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "ConditionNotMet",
+      "retry-after" : "0",
+      "StatusCode" : "412",
+      "x-ms-request-id" : "6fae6821-a01e-002d-372e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>ConditionNotMet</Code><Message>The condition specified using HTTP conditional header(s) is not met.\nRequestId:6fae6821-a01e-002d-372e-5369b1000000\nTime:2021-05-27T19:30:36.8249644Z</Message></Error>",
+      "x-ms-client-request-id" : "e6a10127-1132-4def-8694-9ce96d7dab27",
+      "Date" : "Thu, 27 May 2021 19:30:36 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "6f9714f106f9714f1e2e9999704236d02bf43499183d", "6f9714f116f9714f1e2e0906934f0e7cc2c6c41a2b61", "6f9714f126f9714f1e2e723114916c5b2201b4df4a6f", "2021-05-27T19:30:37.668717700Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[0].json
new file mode 100644
index 000000000000..742ec187a1c3
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[0].json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bee3c81f0bee3c81ff0476185073e89b6dea64827bd3?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "999d1dc6-fe46-4928-b584-da364bf50768"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145DE955648",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:22 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae5b79-a01e-002d-372e-5369b1000000",
+      "x-ms-client-request-id" : "999d1dc6-fe46-4928-b584-da364bf50768",
+      "Date" : "Thu, 27 May 2021 19:30:21 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bee3c81f1bee3c81ff0410058d394bf05f8024576b5a/bee3c81f2bee3c81ff04014883c8f6729bd2b425991b",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "dec599d6-9239-4389-a6b4-c34b6c57d000",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:22 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:22.6531915Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:22 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145DEF2864B",
+      "x-ms-request-id" : "6fae5c0b-a01e-002d-322e-5369b1000000",
+      "x-ms-client-request-id" : "dec599d6-9239-4389-a6b4-c34b6c57d000"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bee3c81f1bee3c81ff0410058d394bf05f8024576b5a/bee3c81f2bee3c81ff04014883c8f6729bd2b425991b?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9d11a59e-aa68-498d-9033-70082d60d631"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:25 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae5c2a-a01e-002d-4d2e-5369b1000000",
+      "x-ms-client-request-id" : "9d11a59e-aa68-498d-9033-70082d60d631",
+      "Date" : "Thu, 27 May 2021 19:30:22 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "bee3c81f0bee3c81ff0476185073e89b6dea64827bd3", "bee3c81f1bee3c81ff0410058d394bf05f8024576b5a", "bee3c81f2bee3c81ff04014883c8f6729bd2b425991b", "2021-05-27T19:30:23.613626900Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[1].json
new file mode 100644
index 000000000000..526533ce86c1
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyAC[1].json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a7f8f95e0a7f8f95efad973804e834057ad6a49a58b7?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "928e8a2d-065a-4e58-8530-6f1a8a8df36d"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145E2BF9D61",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:29 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae60f6-a01e-002d-2a2e-5369b1000000",
+      "x-ms-client-request-id" : "928e8a2d-065a-4e58-8530-6f1a8a8df36d",
+      "Date" : "Thu, 27 May 2021 19:30:28 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a7f8f95e1a7f8f95efad34142e396f162341742d3a6f/a7f8f95e2a7f8f95efad36451c059d6e8eb2a4740a3c",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "2966f37a-e9f1-457c-8612-b62fe42142fe",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:29 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:29.5961257Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:29 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145E315EEA9",
+      "x-ms-request-id" : "6fae6173-a01e-002d-132e-5369b1000000",
+      "x-ms-client-request-id" : "2966f37a-e9f1-457c-8612-b62fe42142fe"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a7f8f95e1a7f8f95efad34142e396f162341742d3a6f/a7f8f95e2a7f8f95efad36451c059d6e8eb2a4740a3c?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3ec0b61d-e687-4f61-b93a-5607ddd4064b"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:32 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae6184-a01e-002d-202e-5369b1000000",
+      "x-ms-client-request-id" : "3ec0b61d-e687-4f61-b93a-5607ddd4064b",
+      "Date" : "Thu, 27 May 2021 19:30:29 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "a7f8f95e0a7f8f95efad973804e834057ad6a49a58b7", "a7f8f95e1a7f8f95efad34142e396f162341742d3a6f", "a7f8f95e2a7f8f95efad36451c059d6e8eb2a4740a3c", "2021-05-27T19:30:30.518837300Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyError.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyError.json
new file mode 100644
index 000000000000..c464ae2209b9
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyError.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a29af0b60a29af0b6342749099d4bec3197634b878b7?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f34a7aab-716b-44ae-8135-b09b7d4153aa"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145E840B203",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:38 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae6960-a01e-002d-3a2e-5369b1000000",
+      "x-ms-client-request-id" : "f34a7aab-716b-44ae-8135-b09b7d4153aa",
+      "Date" : "Thu, 27 May 2021 19:30:37 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a29af0b61a29af0b634299937f377e27a4f294fd0b9c/a29af0b62a29af0b63426959523d1951d13cf47afb0e",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8287997f-3ebd-4371-8c08-b46864a1a021",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:38 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:38.8637116Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:38 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145E89BE6A9",
+      "x-ms-request-id" : "6fae69eb-a01e-002d-342e-5369b1000000",
+      "x-ms-client-request-id" : "8287997f-3ebd-4371-8c08-b46864a1a021"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/a29af0b61a29af0b634299937f377e27a4f294fd0b9c/a29af0b63a29af0b634256958026593c9b7164dbfa11?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "adcceb4b-0d34-4851-9086-e4ecde64dee7"
+    },
+    "Response" : {
+      "content-length" : "216",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "BlobNotFound",
+      "retry-after" : "0",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "6fae6a07-a01e-002d-4b2e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>BlobNotFound</Code><Message>The specified blob does not exist.\nRequestId:6fae6a07-a01e-002d-4b2e-5369b1000000\nTime:2021-05-27T19:30:38.9424666Z</Message></Error>",
+      "x-ms-client-request-id" : "adcceb4b-0d34-4851-9086-e4ecde64dee7",
+      "Date" : "Thu, 27 May 2021 19:30:38 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "a29af0b60a29af0b6342749099d4bec3197634b878b7", "a29af0b61a29af0b634299937f377e27a4f294fd0b9c", "a29af0b62a29af0b63426959523d1951d13cf47afb0e", "a29af0b63a29af0b634256958026593c9b7164dbfa11", "2021-05-27T19:30:39.786663Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyIA.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyIA.json
new file mode 100644
index 000000000000..7a4212fed072
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyIA.json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1194909e01194909ea1801848275ac675a531443dbb8?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cbda0cdc-af4d-4407-8c38-2cace594aed8"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145E950574C",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:40 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae6b02-a01e-002d-272e-5369b1000000",
+      "x-ms-client-request-id" : "cbda0cdc-af4d-4407-8c38-2cace594aed8",
+      "Date" : "Thu, 27 May 2021 19:30:39 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1194909e11194909ea1883281460da4c7491949879d6/1194909e21194909ea185473504fa080b36824d868ad",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "790cbe6f-26bb-4a7c-90d6-5df60cfad855",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:40 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:40.6599886Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:40 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145E9AE24CE",
+      "x-ms-request-id" : "6fae6bb5-a01e-002d-392e-5369b1000000",
+      "x-ms-client-request-id" : "790cbe6f-26bb-4a7c-90d6-5df60cfad855"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "1194909e01194909ea1801848275ac675a531443dbb8", "1194909e11194909ea1883281460da4c7491949879d6", "1194909e21194909ea185473504fa080b36824d868ad", "2021-05-27T19:30:41.579827500Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyMin.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyMin.json
new file mode 100644
index 000000000000..a9b3277abe50
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyMin.json
@@ -0,0 +1,72 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/35fa8f77035fa8f77f044077222823529fb0140f78fe?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3768d026-b423-4436-b6c2-bc8bbbd90719"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145D4BE00CD",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:05 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae4a60-a01e-002d-1c2e-5369b1000000",
+      "x-ms-client-request-id" : "3768d026-b423-4436-b6c2-bc8bbbd90719",
+      "Date" : "Thu, 27 May 2021 19:30:05 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/35fa8f77135fa8f77f04064142f07614b9904485fac2/35fa8f77235fa8f77f0442672aea10378e9a34819835",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bddb632e-0eb2-473a-addf-60e40e00b27e",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:07 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:07.9797693Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:07 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145D63389BD",
+      "x-ms-request-id" : "6fae4cd8-a01e-002d-292e-5369b1000000",
+      "x-ms-client-request-id" : "bddb632e-0eb2-473a-addf-60e40e00b27e"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/35fa8f77135fa8f77f04064142f07614b9904485fac2/35fa8f77235fa8f77f0442672aea10378e9a34819835?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "db913330-eebb-43d3-955b-c537abda4cae"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:10 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae4cfe-a01e-002d-472e-5369b1000000",
+      "x-ms-client-request-id" : "db913330-eebb-43d3-955b-c537abda4cae",
+      "Date" : "Thu, 27 May 2021 19:30:07 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "35fa8f77035fa8f77f044077222823529fb0140f78fe", "35fa8f77135fa8f77f04064142f07614b9904485fac2", "35fa8f77235fa8f77f0442672aea10378e9a34819835", "2021-05-27T19:30:08.925445400Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicy[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicy[0].json
new file mode 100644
index 000000000000..adf9b01c0128
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicy[0].json
@@ -0,0 +1,129 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f9f8d7be0f9f8d7be03c35094f9e47268a06d484bbc1?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "785132cb-0f3b-4e63-a987-07a4c78c4460"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145DA564B2E",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:14 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae5479-a01e-002d-712e-5369b1000000",
+      "x-ms-client-request-id" : "785132cb-0f3b-4e63-a987-07a4c78c4460",
+      "Date" : "Thu, 27 May 2021 19:30:14 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba/f9f8d7be2f9f8d7be03c9162320d9e24b68624109898",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "68d448d5-f1e6-45d9-8065-5392f4d707ef",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:15 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:15.4750957Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:15 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145DAAB3BED",
+      "x-ms-request-id" : "6fae5532-a01e-002d-062e-5369b1000000",
+      "x-ms-client-request-id" : "68d448d5-f1e6-45d9-8065-5392f4d707ef"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba/f9f8d7be2f9f8d7be03c9162320d9e24b68624109898?comp=immutabilityPolicies",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "14983565-5eda-4e3f-9f6e-41fad056c1e1"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:18 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae5544-a01e-002d-142e-5369b1000000",
+      "x-ms-client-request-id" : "14983565-5eda-4e3f-9f6e-41fad056c1e1",
+      "Date" : "Thu, 27 May 2021 19:30:15 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba/f9f8d7be2f9f8d7be03c9162320d9e24b68624109898",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ca09735e-c5db-4664-bc78-f4ce623f83dc"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:15 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:15.4750957Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:30:15 GMT",
+      "eTag" : "0x8D92145DAAB3BED",
+      "x-ms-request-id" : "6fae556f-a01e-002d-322e-5369b1000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:30:15 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:30:18 GMT",
+      "Date" : "Thu, 27 May 2021 19:30:15 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-client-request-id" : "ca09735e-c5db-4664-bc78-f4ce623f83dc"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba?restype=container&comp=list&include=immutabilitypolicy%2Clegalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "bad06dd6-7d1d-490c-bc84-9e2050bb3202"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae5584-a01e-002d-452e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba\"><Blobs><Blob><Name>f9f8d7be2f9f8d7be03c9162320d9e24b68624109898</Name><VersionId>2021-05-27T19:30:15.4750957Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Thu, 27 May 2021 19:30:15 GMT</Creation-Time><Last-Modified>Thu, 27 May 2021 19:30:15 GMT</Last-Modified><Etag>0x8D92145DAAB3BED</Etag><Content-Length>0</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>1B2M2Y8AsgTpgAmY7PhCfg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Thu, 27 May 2021 19:30:15 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><ImmutabilityPolicyUntilDate>Thu, 27 May 2021 19:30:18 GMT</ImmutabilityPolicyUntilDate><ImmutabilityPolicyMode>unlocked</ImmutabilityPolicyMode></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "bad06dd6-7d1d-490c-bc84-9e2050bb3202",
+      "Date" : "Thu, 27 May 2021 19:30:15 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "f9f8d7be0f9f8d7be03c35094f9e47268a06d484bbc1", "f9f8d7be1f9f8d7be03c75436721de7444a2d44e28ba", "f9f8d7be2f9f8d7be03c9162320d9e24b68624109898", "2021-05-27T19:30:16.401924500Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldError.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldError.json
new file mode 100644
index 000000000000..8cb53e99fb82
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldError.json
@@ -0,0 +1,73 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1cad1a8201cad1a8226d2748443d1e3edf0574ef6ad9?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cdeebd59-c27f-4ca6-b9bd-b0a8845a809b"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F292F321",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:55 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae7880-a01e-002d-272e-5369b1000000",
+      "x-ms-client-request-id" : "cdeebd59-c27f-4ca6-b9bd-b0a8845a809b",
+      "Date" : "Thu, 27 May 2021 19:30:55 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1cad1a8211cad1a8226d34657002385c9d9044b90bc1/1cad1a8221cad1a8226d623027e8f1a55026d499fad6",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0ed0f080-bb09-4a97-ab3b-229f0f671ec1",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:56 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:56.1499911Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:55 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145F2E9BB07",
+      "x-ms-request-id" : "6fae78e6-a01e-002d-012e-5369b1000000",
+      "x-ms-client-request-id" : "0ed0f080-bb09-4a97-ab3b-229f0f671ec1"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1cad1a8211cad1a8226d34657002385c9d9044b90bc1/1cad1a8231cad1a8226d76925417631f1c7ae4db2876?comp=legalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1444b24c-2d64-40be-8036-cc64a89345dc"
+    },
+    "Response" : {
+      "content-length" : "216",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "BlobNotFound",
+      "retry-after" : "0",
+      "StatusCode" : "404",
+      "x-ms-request-id" : "6fae7900-a01e-002d-142e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Error><Code>BlobNotFound</Code><Message>The specified blob does not exist.\nRequestId:6fae7900-a01e-002d-142e-5369b1000000\nTime:2021-05-27T19:30:56.2297226Z</Message></Error>",
+      "x-ms-client-request-id" : "1444b24c-2d64-40be-8036-cc64a89345dc",
+      "Date" : "Thu, 27 May 2021 19:30:55 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "1cad1a8201cad1a8226d2748443d1e3edf0574ef6ad9", "1cad1a8211cad1a8226d34657002385c9d9044b90bc1", "1cad1a8221cad1a8226d623027e8f1a55026d499fad6", "1cad1a8231cad1a8226d76925417631f1c7ae4db2876" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[0].json
new file mode 100644
index 000000000000..eaa303ace91f
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[0].json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c4f321c00c4f321c0c8a8530446859f65530e46fab2e?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e305fc7b-16b8-4603-bf3d-9f1a932d85c2"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145EDBA9934",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:47 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae719e-a01e-002d-1d2e-5369b1000000",
+      "x-ms-client-request-id" : "e305fc7b-16b8-4603-bf3d-9f1a932d85c2",
+      "Date" : "Thu, 27 May 2021 19:30:47 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c4f321c01c4f321c0c8a08080f64f872d2bca47d1a26/c4f321c02c4f321c0c8a32656154152657b384460beb",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "89ea3ee3-81d7-4386-b793-a3fac901cb45",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:48 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:48.0242222Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:47 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145EE11D62E",
+      "x-ms-request-id" : "6fae7207-a01e-002d-702e-5369b1000000",
+      "x-ms-client-request-id" : "89ea3ee3-81d7-4386-b793-a3fac901cb45"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/c4f321c01c4f321c0c8a08080f64f872d2bca47d1a26/c4f321c02c4f321c0c8a32656154152657b384460beb?comp=legalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "338e547a-bc9d-4235-9f67-b7f6d8ea2e34"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "true",
+      "x-ms-request-id" : "6fae723a-a01e-002d-162e-5369b1000000",
+      "x-ms-client-request-id" : "338e547a-bc9d-4235-9f67-b7f6d8ea2e34",
+      "Date" : "Thu, 27 May 2021 19:30:48 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "c4f321c00c4f321c0c8a8530446859f65530e46fab2e", "c4f321c01c4f321c0c8a08080f64f872d2bca47d1a26", "c4f321c02c4f321c0c8a32656154152657b384460beb" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[1].json
new file mode 100644
index 000000000000..dd130611a321
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHoldMin[1].json
@@ -0,0 +1,71 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/dde810810dde810814c564663cd263218ded24c53b70?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fffe5fef-634c-4303-abf0-01e85fd92a59"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145EF0900CB",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:49 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae735e-a01e-002d-032e-5369b1000000",
+      "x-ms-client-request-id" : "fffe5fef-634c-4303-abf0-01e85fd92a59",
+      "Date" : "Thu, 27 May 2021 19:30:49 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/dde810811dde810814c5748314d1a13006b394eeb8f2/dde810812dde810814c59645123276b064a5e4a0ab2c",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0b1c1e1d-6caa-410d-8b44-e809e44a2e43",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:50 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:50.4499397Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:50 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145EF83D1B3",
+      "x-ms-request-id" : "6fae7417-a01e-002d-192e-5369b1000000",
+      "x-ms-client-request-id" : "0b1c1e1d-6caa-410d-8b44-e809e44a2e43"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/dde810811dde810814c5748314d1a13006b394eeb8f2/dde810812dde810814c59645123276b064a5e4a0ab2c?comp=legalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "669920e5-9740-4209-b702-46e82dee24d5"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "x-ms-request-id" : "6fae742b-a01e-002d-2b2e-5369b1000000",
+      "x-ms-client-request-id" : "669920e5-9740-4209-b702-46e82dee24d5",
+      "Date" : "Thu, 27 May 2021 19:30:50 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "dde810810dde810814c564663cd263218ded24c53b70", "dde810811dde810814c5748314d1a13006b394eeb8f2", "dde810812dde810814c59645123276b064a5e4a0ab2c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[0].json
new file mode 100644
index 000000000000..6e87a4aba1d0
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[0].json
@@ -0,0 +1,127 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0038749a00038749aa4e5464192f4d7266364456b990?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "306dbf9e-102d-43c8-aa22-120a58ab1ab7"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F0442B07",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:51 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae7530-a01e-002d-7d2e-5369b1000000",
+      "x-ms-client-request-id" : "306dbf9e-102d-43c8-aa22-120a58ab1ab7",
+      "Date" : "Thu, 27 May 2021 19:30:51 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0038749a10038749aa4e208526673b23e0591437b9ee/0038749a20038749aa4e175695cd9337dc9d6435087a",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "94061b0f-de3a-4384-8d33-e923edb9cd71",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:52 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:52.2692331Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:51 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145F09992EB",
+      "x-ms-request-id" : "6fae75bd-a01e-002d-6d2e-5369b1000000",
+      "x-ms-client-request-id" : "94061b0f-de3a-4384-8d33-e923edb9cd71"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0038749a10038749aa4e208526673b23e0591437b9ee/0038749a20038749aa4e175695cd9337dc9d6435087a?comp=legalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fd8d74a7-3c20-4aac-ad4a-b86d2d62cc12"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "true",
+      "x-ms-request-id" : "6fae75c8-a01e-002d-762e-5369b1000000",
+      "x-ms-client-request-id" : "fd8d74a7-3c20-4aac-ad4a-b86d2d62cc12",
+      "Date" : "Thu, 27 May 2021 19:30:52 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0038749a10038749aa4e208526673b23e0591437b9ee/0038749a20038749aa4e175695cd9337dc9d6435087a",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3ff0f7ad-05e9-48dc-b67e-4cdaebcc95bf"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:30:52 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:52 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:52.2692331Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:52 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:30:52 GMT",
+      "eTag" : "0x8D92145F09992EB",
+      "x-ms-request-id" : "6fae75d6-a01e-002d-012e-5369b1000000",
+      "x-ms-client-request-id" : "3ff0f7ad-05e9-48dc-b67e-4cdaebcc95bf",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0038749a10038749aa4e208526673b23e0591437b9ee?restype=container&comp=list&include=immutabilitypolicy%2Clegalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b52e0c58-162a-4a3a-89c0-dee3f501e74f"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae75ed-a01e-002d-0f2e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"0038749a10038749aa4e208526673b23e0591437b9ee\"><Blobs><Blob><Name>0038749a20038749aa4e175695cd9337dc9d6435087a</Name><VersionId>2021-05-27T19:30:52.2692331Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Thu, 27 May 2021 19:30:52 GMT</Creation-Time><Last-Modified>Thu, 27 May 2021 19:30:52 GMT</Last-Modified><Etag>0x8D92145F09992EB</Etag><Content-Length>0</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>1B2M2Y8AsgTpgAmY7PhCfg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Thu, 27 May 2021 19:30:52 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><LegalHold>true</LegalHold></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "b52e0c58-162a-4a3a-89c0-dee3f501e74f",
+      "Date" : "Thu, 27 May 2021 19:30:52 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "0038749a00038749aa4e5464192f4d7266364456b990", "0038749a10038749aa4e208526673b23e0591437b9ee", "0038749a20038749aa4e175695cd9337dc9d6435087a" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[1].json
new file mode 100644
index 000000000000..cf6bbb457349
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetLegalHold[1].json
@@ -0,0 +1,127 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/192345db0192345db76951814025818c3afb944e4802?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3041533d-d404-4a18-b368-ec0164cf5990"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92145F170D3B5",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:53 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6fae76ee-a01e-002d-5d2e-5369b1000000",
+      "x-ms-client-request-id" : "3041533d-d404-4a18-b368-ec0164cf5990",
+      "Date" : "Thu, 27 May 2021 19:30:53 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/192345db1192345db769129816c5586fdf56a48c7909/192345db2192345db76907154af2a6809768b449f80c",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b4e7418e-16ac-4de7-8ddd-2a31e2580fb7",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:54 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:54.2296259Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:30:53 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D92145F1C4B4C3",
+      "x-ms-request-id" : "6fae7760-a01e-002d-382e-5369b1000000",
+      "x-ms-client-request-id" : "b4e7418e-16ac-4de7-8ddd-2a31e2580fb7"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/192345db1192345db769129816c5586fdf56a48c7909/192345db2192345db76907154af2a6809768b449f80c?comp=legalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c7d5a4e3-ec19-4341-a643-cd6e64d6da72"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "x-ms-request-id" : "6fae7778-a01e-002d-4c2e-5369b1000000",
+      "x-ms-client-request-id" : "c7d5a4e3-ec19-4341-a643-cd6e64d6da72",
+      "Date" : "Thu, 27 May 2021 19:30:54 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/192345db1192345db769129816c5586fdf56a48c7909/192345db2192345db76907154af2a6809768b449f80c",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ebefa5c1-b93a-4d37-9f44-c230caf8042d"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:30:54 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:30:54 GMT",
+      "x-ms-version-id" : "2021-05-27T19:30:54.2296259Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-legal-hold" : "false",
+      "Date" : "Thu, 27 May 2021 19:30:54 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "x-ms-blob-type" : "BlockBlob",
+      "Accept-Ranges" : "bytes",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:30:54 GMT",
+      "eTag" : "0x8D92145F1C4B4C3",
+      "x-ms-request-id" : "6fae778c-a01e-002d-5f2e-5369b1000000",
+      "x-ms-client-request-id" : "ebefa5c1-b93a-4d37-9f44-c230caf8042d",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/192345db1192345db769129816c5586fdf56a48c7909?restype=container&comp=list&include=immutabilitypolicy%2Clegalhold",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f1c3f117-7fd9-4957-adf7-fe85c8bdb5ec"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6fae779a-a01e-002d-6a2e-5369b1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"192345db1192345db769129816c5586fdf56a48c7909\"><Blobs><Blob><Name>192345db2192345db76907154af2a6809768b449f80c</Name><VersionId>2021-05-27T19:30:54.2296259Z</VersionId><IsCurrentVersion>true</IsCurrentVersion><Properties><Creation-Time>Thu, 27 May 2021 19:30:54 GMT</Creation-Time><Last-Modified>Thu, 27 May 2021 19:30:54 GMT</Last-Modified><Etag>0x8D92145F1C4B4C3</Etag><Content-Length>0</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5>1B2M2Y8AsgTpgAmY7PhCfg==</Content-MD5><Cache-Control /><Content-Disposition /><LastAccessTime>Thu, 27 May 2021 19:30:54 GMT</LastAccessTime><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><LegalHold>false</LegalHold></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "f1c3f117-7fd9-4957-adf7-fe85c8bdb5ec",
+      "Date" : "Thu, 27 May 2021 19:30:54 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "192345db0192345db76951814025818c3afb944e4802", "192345db1192345db769129816c5586fdf56a48c7909", "192345db2192345db76907154af2a6809768b449f80c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSyncCopy.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSyncCopy.json
new file mode 100644
index 000000000000..093fddff421e
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSyncCopy.json
@@ -0,0 +1,162 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c0d26dfd8c66c643965f9fa5d417fb493c876?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "376d5c0b-053b-42e3-8872-7d157b517456"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9214613929A8E",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:50 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "72ac20e1-501e-0090-462e-53e0ac000000",
+      "x-ms-client-request-id" : "376d5c0b-053b-42e3-8872-7d157b517456",
+      "Date" : "Thu, 27 May 2021 19:31:50 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962/d26dfd8c2d26dfd8c66c056963ddec71061124ac0a65",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0af9e98e-f497-41f6-b2ae-bdf05d9071d7",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:51 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:51.5923811Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:50 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D9214613F59163",
+      "x-ms-request-id" : "72ac21b2-501e-0090-6d2e-53e0ac000000",
+      "x-ms-client-request-id" : "0af9e98e-f497-41f6-b2ae-bdf05d9071d7"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962?restype=container&comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fb0bfee0-8fbe-4c2d-8cfa-490d5c3076de",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9214614015612",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:51 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "72ac21c2-501e-0090-7a2e-53e0ac000000",
+      "x-ms-client-request-id" : "fb0bfee0-8fbe-4c2d-8cfa-490d5c3076de",
+      "Date" : "Thu, 27 May 2021 19:31:50 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962/d26dfd8c3d26dfd8c66c5153743fb081fb0274d9199a",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "647fabee-69ee-4a41-8402-4df1d4a6d9dd"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-copy-id" : "11b3722b-93c1-4f73-a16e-15aab4bbc0ed",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:51 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:52.5570663Z",
+      "retry-after" : "0",
+      "StatusCode" : "202",
+      "Date" : "Thu, 27 May 2021 19:31:51 GMT",
+      "eTag" : "0x8D92146141E7949",
+      "x-ms-copy-status" : "success",
+      "x-ms-request-id" : "72ac21d0-501e-0090-072e-53e0ac000000",
+      "x-ms-client-request-id" : "647fabee-69ee-4a41-8402-4df1d4a6d9dd"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "HEAD",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962/d26dfd8c3d26dfd8c66c5153743fb081fb0274d9199a",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7eb58e7c-5c9b-4774-8a50-32adb6de31e0"
+    },
+    "Response" : {
+      "x-ms-is-current-version" : "true",
+      "content-length" : "0",
+      "x-ms-lease-status" : "unlocked",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-lease-state" : "available",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:51 GMT",
+      "x-ms-version-id" : "2021-05-27T19:31:52.5570663Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-blob-type" : "BlockBlob",
+      "x-ms-immutability-policy-mode" : "unlocked",
+      "x-ms-access-tier-inferred" : "true",
+      "x-ms-access-tier" : "Hot",
+      "x-ms-creation-time" : "Thu, 27 May 2021 19:31:51 GMT",
+      "eTag" : "0x8D92146141E7949",
+      "x-ms-request-id" : "72ac227a-501e-0090-122e-53e0ac000000",
+      "Content-Type" : "application/octet-stream",
+      "x-ms-last-access-time" : "Thu, 27 May 2021 19:31:51 GMT",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-copy-id" : "11b3722b-93c1-4f73-a16e-15aab4bbc0ed",
+      "x-ms-immutability-policy-until-date" : "Thu, 27 May 2021 19:31:54 GMT",
+      "x-ms-copy-source" : "https://seanmcccanary3.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962/d26dfd8c2d26dfd8c66c056963ddec71061124ac0a65",
+      "x-ms-copy-progress" : "0/0",
+      "x-ms-legal-hold" : "true",
+      "Date" : "Thu, 27 May 2021 19:31:51 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "Accept-Ranges" : "bytes",
+      "x-ms-copy-completion-time" : "Thu, 27 May 2021 19:31:51 GMT",
+      "x-ms-server-encrypted" : "true",
+      "x-ms-copy-status" : "success",
+      "x-ms-client-request-id" : "7eb58e7c-5c9b-4774-8a50-32adb6de31e0"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962?restype=container&comp=acl",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1fdb99bd-e71d-4e1d-b2f8-b2549626c48c",
+      "Content-Type" : "application/xml"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9214614A358A0",
+      "Last-Modified" : "Thu, 27 May 2021 19:31:52 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "72ac228d-501e-0090-212e-53e0ac000000",
+      "x-ms-client-request-id" : "1fdb99bd-e71d-4e1d-b2f8-b2549626c48c",
+      "Date" : "Thu, 27 May 2021 19:31:52 GMT"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "d26dfd8c0d26dfd8c66c643965f9fa5d417fb493c876", "d26dfd8c1d26dfd8c66c760042309e5a7dac44cbe962", "d26dfd8c2d26dfd8c66c056963ddec71061124ac0a65", "d26dfd8c3d26dfd8c66c5153743fb081fb0274d9199a", "2021-05-27T19:31:52.581737600Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/swagger/README.md b/sdk/storage/azure-storage-blob/swagger/README.md
index 2cfdc9d3b232..31fbf55f2ecf 100644
--- a/sdk/storage/azure-storage-blob/swagger/README.md
+++ b/sdk/storage/azure-storage-blob/swagger/README.md
@@ -29,7 +29,7 @@ license-header: MICROSOFT_MIT_SMALL
 context-client-method-parameter: true
 optional-constant-as-enum: true
 models-subpackage: implementation.models
-custom-types: BlobAccessPolicy,AccessTier,AccountKind,ArchiveStatus,BlobHttpHeaders,BlobContainerItem,BlobContainerItemProperties,BlobContainerEncryptionScope,BlobServiceProperties,BlobType,Block,BlockList,BlockListType,BlockLookupList,BlobPrefix,ClearRange,CopyStatusType,BlobCorsRule,CpkInfo,CustomerProvidedKeyInfo,DeleteSnapshotsOptionType,EncryptionAlgorithmType,FilterBlobsItem,GeoReplication,GeoReplicationStatusType,KeyInfo,LeaseDurationType,LeaseStateType,LeaseStatusType,ListBlobContainersIncludeType,ListBlobsIncludeItem,BlobAnalyticsLogging,BlobMetrics,PageList,PageRange,PathRenameMode,PublicAccessType,RehydratePriority,BlobRetentionPolicy,SequenceNumberActionType,BlobSignedIdentifier,SkuName,StaticWebsite,BlobErrorCode,BlobServiceStatistics,SyncCopyStatusType,UserDelegationKey,BlobQueryHeaders,GeoReplicationStatus
+custom-types: BlobAccessPolicy,AccessTier,AccountKind,ArchiveStatus,BlobHttpHeaders,BlobContainerItem,BlobContainerItemProperties,BlobContainerEncryptionScope,BlobServiceProperties,BlobType,Block,BlockList,BlockListType,BlockLookupList,BlobPrefix,ClearRange,CopyStatusType,BlobCorsRule,CpkInfo,CustomerProvidedKeyInfo,DeleteSnapshotsOptionType,EncryptionAlgorithmType,FilterBlobsItem,GeoReplication,GeoReplicationStatusType,KeyInfo,LeaseDurationType,LeaseStateType,LeaseStatusType,ListBlobContainersIncludeType,ListBlobsIncludeItem,BlobAnalyticsLogging,BlobMetrics,PageList,PageRange,PathRenameMode,PublicAccessType,RehydratePriority,BlobRetentionPolicy,SequenceNumberActionType,BlobSignedIdentifier,SkuName,StaticWebsite,BlobErrorCode,BlobServiceStatistics,SyncCopyStatusType,UserDelegationKey,BlobQueryHeaders,GeoReplicationStatus,BlobImmutabilityPolicyMode
 custom-types-subpackage: models
 customization-jar-path: target/azure-storage-blob-customization-1.0.0-beta.1.jar
 customization-class: com.azure.storage.blob.customization.BlobStorageCustomization
@@ -727,6 +727,40 @@ directive:
     }
 ```
 
+### /{containerName}/{blob}?comp=immutabilityPolicies
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=immutabilityPolicies"]
+  transform: >
+    let putParam = $.put.parameters[0];
+    if (!putParam["$ref"].endsWith("ContainerName")) {
+      const path = putParam["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+    let deleteParam = $.delete.parameters[0];
+    if (!deleteParam["$ref"].endsWith("ContainerName")) {
+      const path = deleteParam["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.delete.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.delete.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
+### /{containerName}/{blob}?comp=legalhold
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-paths"]["/{containerName}/{blob}?comp=legalhold"]
+  transform: >
+    let param = $.put.parameters[0];
+    if (!param["$ref"].endsWith("ContainerName")) {
+      const path = param["$ref"].replace(/[#].*$/, "#/parameters/");
+      $.put.parameters.splice(0, 0, { "$ref": path + "ContainerName" });
+      $.put.parameters.splice(1, 0, { "$ref": path + "Blob" });
+    }
+```
+
 ### BlobItemInternal
 ``` yaml
 directive:
diff --git a/sdk/storage/azure-storage-blob/swagger/src/main/java/com/azure/storage/blob/customization/BlobStorageCustomization.java b/sdk/storage/azure-storage-blob/swagger/src/main/java/com/azure/storage/blob/customization/BlobStorageCustomization.java
index ee81f7e2e0ca..8774460e0732 100644
--- a/sdk/storage/azure-storage-blob/swagger/src/main/java/com/azure/storage/blob/customization/BlobStorageCustomization.java
+++ b/sdk/storage/azure-storage-blob/swagger/src/main/java/com/azure/storage/blob/customization/BlobStorageCustomization.java
@@ -35,6 +35,9 @@ public void customize(LibraryCustomization customization) {
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("undelete"));
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("setExpiry"));
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("setHttpHeaders"));
+        modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("setImmutabilityPolicy"));
+        modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("deleteImmutabilityPolicy"));
+        modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("setLegalHold"));
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("setMetadata"));
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("acquireLease"));
         modifyUnexpectedResponseExceptionType(blobsImpl.getMethod("releaseLease"));
@@ -132,6 +135,7 @@ public void customize(LibraryCustomization customization) {
 
         ClassCustomization blobContainerItemProperties = models.getClass("BlobContainerItemProperties");
         blobContainerItemProperties.getMethod("isEncryptionScopeOverridePrevented").setReturnType("boolean", "return Boolean.TRUE.equals(%s);", true);
+        blobContainerItemProperties.getMethod("setIsImmutableStorageWithVersioningEnabled").rename("setImmutableStorageWithVersioningEnabled");
 
         // Block - Generator
         ClassCustomization block = models.getClass("Block");
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
index a6fb8cb85dfa..1a4ea76ec1f5 100644
--- a/sdk/storage/azure-storage-common/CHANGELOG.md
+++ b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.12.0-beta.2 (Unreleased)
-
+- Added support for the set immutability policy permission for Account SAS. 
 
 ## 12.12.0-beta.1 (2021-05-13)
 - Fixed bug in Utility.convertStreamToByteBuffer where variable updates would happen incorrectly if we hit the end of stream.
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/sas/AccountSasPermission.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/sas/AccountSasPermission.java
index 334006a3daed..31d8ac161774 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/sas/AccountSasPermission.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/sas/AccountSasPermission.java
@@ -45,6 +45,8 @@ public final class AccountSasPermission {
 
     private boolean filterTagsPermission;
 
+    private boolean immutabilityPolicyPermission;
+
     /**
      * Initializes an {@link AccountSasPermission} object with all fields set to false.
      */
@@ -59,8 +61,8 @@ public AccountSasPermission() {
      *
      * @return An {@link AccountSasPermission} object generated from the given {@link String}.
      *
-     * @throws IllegalArgumentException If {@code permissionString} contains a character other than r, w, d, x, l, a, c, u, p,
-     * t or f.
+     * @throws IllegalArgumentException If {@code permString} contains a character other than r, w, d, x, l, a, c, u, p,
+     * t, f or i.
      */
     public static AccountSasPermission parse(String permissionString) {
         AccountSasPermission permissions = new AccountSasPermission();
@@ -101,6 +103,9 @@ public static AccountSasPermission parse(String permissionString) {
                 case 'f':
                     permissions.filterTagsPermission = true;
                     break;
+                case 'i':
+                    permissions.immutabilityPolicyPermission = true;
+                    break;
                 default:
                     throw new IllegalArgumentException(
                         String.format(Locale.ROOT, Constants.ENUM_COULD_NOT_BE_PARSED_INVALID_VALUE,
@@ -304,7 +309,6 @@ public AccountSasPermission setTagsPermission(boolean tagsPermission) {
         return this;
     }
 
-
     /**
      * @return the filter tags permission status.
      */
@@ -323,6 +327,24 @@ public AccountSasPermission setFilterTagsPermission(boolean filterTagsPermission
         return this;
     }
 
+    /**
+     * @return the set immutability policy permission status.
+     */
+    public boolean hasImmutabilityPolicyPermission() {
+        return immutabilityPolicyPermission;
+    }
+
+    /**
+     * Sets the set immutability policy permission status.
+     *
+     * @param immutabilityPolicyPermission Permission status to set
+     * @return the updated AccountSasPermission object.
+     */
+    public AccountSasPermission setImmutabilityPolicyPermission(boolean immutabilityPolicyPermission) {
+        this.immutabilityPolicyPermission = immutabilityPolicyPermission;
+        return this;
+    }
+
     /**
      * Converts the given permissions to a {@link String}. Using this method will guarantee the permissions are in an
      * order accepted by the service.
@@ -379,6 +401,10 @@ public String toString() {
             builder.append('f');
         }
 
+        if (this.immutabilityPolicyPermission) {
+            builder.append('i');
+        }
+
         return builder.toString();
     }
 }
diff --git a/sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/SasModelsTest.groovy b/sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/SasModelsTest.groovy
index a59d5ae74c12..520a86fdc331 100644
--- a/sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/SasModelsTest.groovy
+++ b/sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/SasModelsTest.groovy
@@ -92,24 +92,26 @@ class SasModelsTest extends Specification {
             .setDeleteVersionPermission(deleteVersion)
             .setTagsPermission(tags)
             .setFilterTagsPermission(filterTags)
+            .setImmutabilityPolicyPermission(setImmutabilityPolicy)
 
         expect:
         perms.toString() == expectedString
 
         where:
-        read  | write | delete | list  | add   | create | update | process | deleteVersion | tags  | filterTags || expectedString
-        true  | false | false  | false | false | false  | false  | false   | false         | false | false      || "r"
-        false | true  | false  | false | false | false  | false  | false   | false         | false | false      || "w"
-        false | false | true   | false | false | false  | false  | false   | false         | false | false      || "d"
-        false | false | false  | true  | false | false  | false  | false   | false         | false | false      || "l"
-        false | false | false  | false | true  | false  | false  | false   | false         | false | false      || "a"
-        false | false | false  | false | false | true   | false  | false   | false         | false | false      || "c"
-        false | false | false  | false | false | false  | true   | false   | false         | false | false      || "u"
-        false | false | false  | false | false | false  | false  | true    | false         | false | false      || "p"
-        false | false | false  | false | false | false  | false  | false   | true          | false | false      || "x"
-        false | false | false  | false | false | false  | false  | false   | false         | true  | false      || "t"
-        false | false | false  | false | false | false  | false  | false   | false         | false | true       || "f"
-        true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true       || "rwdxlacuptf"
+        read  | write | delete | list  | add   | create | update | process | deleteVersion | tags  | filterTags | setImmutabilityPolicy || expectedString
+        true  | false | false  | false | false | false  | false  | false   | false         | false | false      | false                 || "r"
+        false | true  | false  | false | false | false  | false  | false   | false         | false | false      | false                 || "w"
+        false | false | true   | false | false | false  | false  | false   | false         | false | false      | false                 || "d"
+        false | false | false  | true  | false | false  | false  | false   | false         | false | false      | false                 || "l"
+        false | false | false  | false | true  | false  | false  | false   | false         | false | false      | false                 || "a"
+        false | false | false  | false | false | true   | false  | false   | false         | false | false      | false                 || "c"
+        false | false | false  | false | false | false  | true   | false   | false         | false | false      | false                 || "u"
+        false | false | false  | false | false | false  | false  | true    | false         | false | false      | false                 || "p"
+        false | false | false  | false | false | false  | false  | false   | true          | false | false      | false                 || "x"
+        false | false | false  | false | false | false  | false  | false   | false         | true  | false      | false                 || "t"
+        false | false | false  | false | false | false  | false  | false   | false         | false | true       | false                 || "f"
+        false | false | false  | false | false | false  | false  | false   | false         | false | false      | true                  || "i"
+        true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true       | true                  || "rwdxlacuptfi"
     }
 
     @Unroll
@@ -129,22 +131,24 @@ class SasModelsTest extends Specification {
         perms.hasDeleteVersionPermission() == deleteVersion
         perms.hasTagsPermission() == tags
         perms.hasFilterTagsPermission() == filterTags
+        perms.hasImmutabilityPolicyPermission() == immutabilityPolicy
 
         where:
-        permString    || read  | write | delete | list  | add   | create | update | process | deleteVersion | tags  | filterTags
-        "r"           || true  | false | false  | false | false | false  | false  | false   | false         | false | false
-        "w"           || false | true  | false  | false | false | false  | false  | false   | false         | false | false
-        "d"           || false | false | true   | false | false | false  | false  | false   | false         | false | false
-        "l"           || false | false | false  | true  | false | false  | false  | false   | false         | false | false
-        "a"           || false | false | false  | false | true  | false  | false  | false   | false         | false | false
-        "c"           || false | false | false  | false | false | true   | false  | false   | false         | false | false
-        "u"           || false | false | false  | false | false | false  | true   | false   | false         | false | false
-        "p"           || false | false | false  | false | false | false  | false  | true    | false         | false | false
-        "x"           || false | false | false  | false | false | false  | false  | false   | true          | false | false
-        "t"           || false | false | false  | false | false | false  | false  | false   | false         | true  | false
-        "f"           || false | false | false  | false | false | false  | false  | false   | false         | false | true
-        "rwdxlacuptf" || true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true
-        "lwfrutpcaxd" || true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true
+        permString     || read  | write | delete | list  | add   | create | update | process | deleteVersion | tags  | filterTags | immutabilityPolicy
+        "r"            || true  | false | false  | false | false | false  | false  | false   | false         | false | false      | false
+        "w"            || false | true  | false  | false | false | false  | false  | false   | false         | false | false      | false
+        "d"            || false | false | true   | false | false | false  | false  | false   | false         | false | false      | false
+        "l"            || false | false | false  | true  | false | false  | false  | false   | false         | false | false      | false
+        "a"            || false | false | false  | false | true  | false  | false  | false   | false         | false | false      | false
+        "c"            || false | false | false  | false | false | true   | false  | false   | false         | false | false      | false
+        "u"            || false | false | false  | false | false | false  | true   | false   | false         | false | false      | false
+        "p"            || false | false | false  | false | false | false  | false  | true    | false         | false | false      | false
+        "x"            || false | false | false  | false | false | false  | false  | false   | true          | false | false      | false
+        "t"            || false | false | false  | false | false | false  | false  | false   | false         | true  | false      | false
+        "f"            || false | false | false  | false | false | false  | false  | false   | false         | false | true       | false
+        "i"            || false | false | false  | false | false | false  | false  | false   | false         | false | false      | true
+        "rwdxlacuptfi" || true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true       | true
+        "lwfriutpcaxd" || true  | true  | true   | true  | true  | true   | true   | true    | true          | true  | true       | true
     }
 
     def "AccountSASPermissions parse IA"() {

From a13f37f74b1e5912d4d12fb6a25d9f523b9cf7ab Mon Sep 17 00:00:00 2001
From: James <41338290+jaschrep-msft@users.noreply.github.com>
Date: Thu, 17 Jun 2021 10:43:28 -0700
Subject: [PATCH 5/9] File listing v2 (#21720)

* swagger generation and hookup

regenerated files swagger for listing
hooked up generated and handwritten models
expanded client API to support new models

* testing and fixes

expanded test parameters for file listing.
swagger transform added.

* rerecorded file listing test

* more testing

also fixed a method name casing

* docstrings and samples

* checkstyle

* reverted primative boolean extended info arg

REST api accepts true or an absence of value. Alligning with .NET for
now on Boolean vs boolean.

* checkpoint

* pr feedback

* misused variable fix

* fixed test

* send nothing, not false: include-extended-info

other minor fixes
rerecorded tests

* import cleanup

* swagger regeneration and test fixes

* API comments

extendedInfo boolean => Boolean
renamed options class

* reidentified samples for options class name change

Co-authored-by: jschrepp-MSFT <41338290+jschrepp-MSFT@users.noreply.github.com>
---
 .../file/share/ShareDirectoryAsyncClient.java |  71 +++-
 .../file/share/ShareDirectoryClient.java      |  31 +-
 .../share/implementation/DirectoriesImpl.java |  14 +
 .../file/share/implementation/FilesImpl.java  |   5 +-
 .../implementation/models/DirectoryItem.java  | 104 +++++
 .../share/implementation/models/FileItem.java |  78 ++++
 .../implementation/models/FileProperty.java   | 165 ++++++++
 ...istFilesAndDirectoriesSegmentResponse.java |  26 ++
 .../models/ListFilesIncludeType.java          |  53 +++
 .../implementation/util/ModelHelper.java      |  10 +
 .../file/share/models/ShareFileItem.java      |  53 +++
 .../share/models/ShareFileItemProperties.java |  80 ++++
 .../ShareListFilesAndDirectoriesOptions.java  | 168 ++++++++
 ...ShareDirectoryAsyncJavaDocCodeSamples.java |  17 +
 .../ShareDirectoryJavaDocCodeSamples.java     |  15 +
 .../file/share/DirectoryAPITests.groovy       |  92 ++++-
 ...PITestsListFilesAndDirectoriesArgs[0].json | 344 +++++++---------
 ...PITestsListFilesAndDirectoriesArgs[1].json | 372 ++++++++----------
 ...PITestsListFilesAndDirectoriesArgs[2].json | 336 +++++++---------
 ...PITestsListFilesAndDirectoriesArgs[3].json | 278 +++++++++++++
 ...PITestsListFilesAndDirectoriesArgs[4].json | 278 +++++++++++++
 ...PITestsListFilesAndDirectoriesArgs[5].json | 278 +++++++++++++
 ...PITestsListFilesAndDirectoriesArgs[6].json | 278 +++++++++++++
 ...PITestsListFilesAndDirectoriesArgs[7].json | 278 +++++++++++++
 ...PITestsListFilesAndDirectoriesArgs[8].json | 278 +++++++++++++
 ...ilesAndDirectoriesExtendedInfoResults.json | 133 +++++++
 .../swagger/README.md                         |   2 +-
 .../azure-storage-file-share/swagger/pom.xml  |   2 +-
 .../ShareStorageCustomization.java            |   3 +-
 29 files changed, 3232 insertions(+), 610 deletions(-)
 create mode 100644 sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesIncludeType.java
 create mode 100644 sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItemProperties.java
 create mode 100644 sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/options/ShareListFilesAndDirectoriesOptions.java
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[3].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[4].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[5].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[6].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[7].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[8].json
 create mode 100644 sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesExtendedInfoResults.json

diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryAsyncClient.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryAsyncClient.java
index e543e913219d..872863374cb5 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryAsyncClient.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryAsyncClient.java
@@ -26,9 +26,12 @@
 import com.azure.storage.file.share.implementation.models.DirectoriesListFilesAndDirectoriesSegmentResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesSetMetadataResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesSetPropertiesResponse;
+import com.azure.storage.file.share.implementation.models.ListFilesIncludeType;
+import com.azure.storage.file.share.implementation.util.ModelHelper;
 import com.azure.storage.file.share.implementation.util.ShareSasImplUtil;
 import com.azure.storage.file.share.models.CloseHandlesInfo;
 import com.azure.storage.file.share.models.HandleItem;
+import com.azure.storage.file.share.models.NtfsFileAttributes;
 import com.azure.storage.file.share.models.ShareDirectoryInfo;
 import com.azure.storage.file.share.models.ShareDirectoryProperties;
 import com.azure.storage.file.share.models.ShareDirectorySetMetadataInfo;
@@ -37,6 +40,7 @@
 import com.azure.storage.file.share.models.ShareFileItem;
 import com.azure.storage.file.share.models.ShareRequestConditions;
 import com.azure.storage.file.share.models.ShareStorageException;
+import com.azure.storage.file.share.options.ShareListFilesAndDirectoriesOptions;
 import com.azure.storage.file.share.sas.ShareServiceSasSignatureValues;
 import reactor.core.publisher.Mono;
 
@@ -46,6 +50,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -605,18 +610,66 @@ public PagedFlux<ShareFileItem> listFilesAndDirectories() {
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedFlux<ShareFileItem> listFilesAndDirectories(String prefix, Integer maxResultsPerPage) {
         try {
-            return listFilesAndDirectoriesWithOptionalTimeout(prefix, maxResultsPerPage, null, Context.NONE);
+            return listFilesAndDirectoriesWithOptionalTimeout(new ShareListFilesAndDirectoriesOptions()
+                .setPrefix(prefix).setMaxResultsPerPage(maxResultsPerPage), null, Context.NONE);
         } catch (RuntimeException ex) {
             return pagedFluxError(logger, ex);
         }
     }
 
-    PagedFlux<ShareFileItem> listFilesAndDirectoriesWithOptionalTimeout(String prefix, Integer maxResultsPerPage,
-                                                                        Duration timeout, Context context) {
+    /**
+     * Lists all sub-directories and files in this directory with their prefix or snapshots.
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * <p>List all sub-directories with "subdir" prefix and return 10 results in the account</p>
+     *
+     * {@codesnippet com.azure.storage.file.share.ShareDirectoryAsyncClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions}
+     *
+     * <p>For more information, see the
+     * <a href="https://docs.microsoft.com/rest/api/storageservices/list-directories-and-files">Azure
+     * Docs</a>.</p>
+     *
+     * @param options Optional parameters.
+     * the server will return up to 5,000 items.
+     * @return {@link ShareFileItem File info} in this directory with prefix and max number of return results.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<ShareFileItem> listFilesAndDirectories(ShareListFilesAndDirectoriesOptions options) {
+        try {
+            return listFilesAndDirectoriesWithOptionalTimeout(options, null, Context.NONE);
+        } catch (RuntimeException ex) {
+            return pagedFluxError(logger, ex);
+        }
+    }
+
+    PagedFlux<ShareFileItem> listFilesAndDirectoriesWithOptionalTimeout(
+        ShareListFilesAndDirectoriesOptions options, Duration timeout, Context context) {
+        final ShareListFilesAndDirectoriesOptions modifiedOptions = options == null
+            ? new ShareListFilesAndDirectoriesOptions() : options;
+
+        List<ListFilesIncludeType> includeTypes = new LinkedList<>();
+        if (modifiedOptions.includeAttributes()) {
+            includeTypes.add(ListFilesIncludeType.ATTRIBUTES);
+        }
+        if (modifiedOptions.includeETag()) {
+            includeTypes.add(ListFilesIncludeType.ETAG);
+        }
+        if (modifiedOptions.includeTimestamps()) {
+            includeTypes.add(ListFilesIncludeType.TIMESTAMPS);
+        }
+        if (modifiedOptions.includePermissionKey()) {
+            includeTypes.add(ListFilesIncludeType.PERMISSION_KEY);
+        }
+
+        // these options must be absent from request if empty or false
+        final List<ListFilesIncludeType> finalIncludeTypes = includeTypes.size() == 0 ? null : includeTypes;
+
         BiFunction<String, Integer, Mono<PagedResponse<ShareFileItem>>> retriever =
             (marker, pageSize) -> StorageImplUtils.applyOptionalTimeout(this.azureFileStorageClient.getDirectories()
-                .listFilesAndDirectoriesSegmentWithResponseAsync(shareName, directoryPath, prefix, snapshot,
-                    marker, pageSize == null ? maxResultsPerPage : pageSize, null, context), timeout)
+                .listFilesAndDirectoriesSegmentWithResponseAsync(shareName, directoryPath, modifiedOptions.getPrefix(),
+                    snapshot, marker, pageSize == null ? modifiedOptions.getMaxResultsPerPage() : pageSize, null,
+                    finalIncludeTypes, modifiedOptions.includeExtendedInfo(), context), timeout)
                 .map(response -> new PagedResponseBase<>(response.getRequest(),
                     response.getStatusCode(),
                     response.getHeaders(),
@@ -1224,10 +1277,14 @@ private List<ShareFileItem> convertResponseAndGetNumOfResults(
         Set<ShareFileItem> shareFileItems = new TreeSet<>(Comparator.comparing(ShareFileItem::getName));
         if (response.getValue().getSegment() != null) {
             response.getValue().getSegment().getDirectoryItems()
-                .forEach(directoryItem -> shareFileItems.add(new ShareFileItem(directoryItem.getName(),
-                    true, null)));
+                .forEach(directoryItem -> shareFileItems.add(new ShareFileItem(directoryItem.getName(), true,
+                    directoryItem.getFileId(), ModelHelper.transformFileProperty(directoryItem.getProperties()),
+                    NtfsFileAttributes.toAttributes(directoryItem.getAttributes()), directoryItem.getPermissionKey(),
+                    null)));
             response.getValue().getSegment().getFileItems()
                 .forEach(fileItem -> shareFileItems.add(new ShareFileItem(fileItem.getName(), false,
+                    fileItem.getFileId(), ModelHelper.transformFileProperty(fileItem.getProperties()),
+                    NtfsFileAttributes.toAttributes(fileItem.getAttributes()), fileItem.getPermissionKey(),
                     fileItem.getProperties().getContentLength())));
         }
 
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryClient.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryClient.java
index 8c0d0fedeabc..9f03fc384284 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryClient.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareDirectoryClient.java
@@ -23,6 +23,7 @@
 import com.azure.storage.file.share.models.ShareRequestConditions;
 import com.azure.storage.file.share.models.ShareStorageException;
 import com.azure.storage.file.share.models.ShareFileItem;
+import com.azure.storage.file.share.options.ShareListFilesAndDirectoriesOptions;
 import com.azure.storage.file.share.sas.ShareServiceSasSignatureValues;
 import reactor.core.publisher.Mono;
 
@@ -438,8 +439,36 @@ public PagedIterable<ShareFileItem> listFilesAndDirectories() {
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ShareFileItem> listFilesAndDirectories(String prefix, Integer maxResultsPerPage,
                                                                 Duration timeout, Context context) {
+        return listFilesAndDirectories(new ShareListFilesAndDirectoriesOptions().setPrefix(prefix)
+            .setMaxResultsPerPage(maxResultsPerPage), timeout, context);
+    }
+
+    /**
+     * Lists all sub-directories and files in this directory with their prefix or snapshots.
+     *
+     * <p><strong>Code Samples</strong></p>
+     *
+     * <p>List all sub-directories and files in this directory with "subdir" prefix and return 10 results in the
+     * account</p>
+     *
+     * {@codesnippet com.azure.storage.file.share.ShareDirectoryClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions-duration-context}
+     *
+     * <p>For more information, see the
+     * <a href="https://docs.microsoft.com/rest/api/storageservices/list-directories-and-files">Azure
+     * Docs</a>.</p>
+     *
+     * @param options Optional parameters.
+     * @param timeout An optional timeout applied to the operation. If a response is not returned before the timeout
+     * concludes a {@link RuntimeException} will be thrown.
+     * @param context Additional context that is passed through the Http pipeline during the service call.
+     * @return {@link ShareFileItem File info} in this directory with prefix and max number of return results.
+     * @throws RuntimeException if the operation doesn't complete before the timeout concludes.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ShareFileItem> listFilesAndDirectories(ShareListFilesAndDirectoriesOptions options,
+        Duration timeout, Context context) {
         return new PagedIterable<>(shareDirectoryAsyncClient
-            .listFilesAndDirectoriesWithOptionalTimeout(prefix, maxResultsPerPage, timeout, context));
+            .listFilesAndDirectoriesWithOptionalTimeout(options, timeout, context));
     }
 
     /**
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/DirectoriesImpl.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/DirectoriesImpl.java
index fb541c8e6e12..9b43c49fb7fe 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/DirectoriesImpl.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/DirectoriesImpl.java
@@ -19,6 +19,8 @@
 import com.azure.core.annotation.UnexpectedResponseExceptionType;
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.util.Context;
+import com.azure.core.util.serializer.CollectionFormat;
+import com.azure.core.util.serializer.JacksonAdapter;
 import com.azure.storage.file.share.implementation.models.DirectoriesCreateResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesDeleteResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesForceCloseHandlesResponse;
@@ -27,7 +29,9 @@
 import com.azure.storage.file.share.implementation.models.DirectoriesListHandlesResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesSetMetadataResponse;
 import com.azure.storage.file.share.implementation.models.DirectoriesSetPropertiesResponse;
+import com.azure.storage.file.share.implementation.models.ListFilesIncludeType;
 import com.azure.storage.file.share.implementation.models.StorageErrorException;
+import java.util.List;
 import java.util.Map;
 import reactor.core.publisher.Mono;
 
@@ -152,6 +156,8 @@ Mono<DirectoriesListFilesAndDirectoriesSegmentResponse> listFilesAndDirectoriesS
                 @QueryParam("maxresults") Integer maxresults,
                 @QueryParam("timeout") Integer timeout,
                 @HeaderParam("x-ms-version") String version,
+                @QueryParam("include") String include,
+                @HeaderParam("x-ms-file-extended-info") Boolean includeExtendedInfo,
                 @HeaderParam("Accept") String accept,
                 Context context);
 
@@ -417,6 +423,8 @@ public Mono<DirectoriesSetMetadataResponse> setMetadataWithResponseAsync(
      * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
      *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/Setting-Timeouts-for-File-Service-Operations?redirectedfrom=MSDN"&gt;Setting
      *     Timeouts for File Service Operations.&lt;/a&gt;.
+     * @param include Include this parameter to specify one or more datasets to include in the response.
+     * @param includeExtendedInfo The includeExtendedInfo parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws StorageErrorException thrown if the request is rejected by server.
@@ -432,10 +440,14 @@ public Mono<DirectoriesListFilesAndDirectoriesSegmentResponse> listFilesAndDirec
             String marker,
             Integer maxresults,
             Integer timeout,
+            List<ListFilesIncludeType> include,
+            Boolean includeExtendedInfo,
             Context context) {
         final String restype = "directory";
         final String comp = "list";
         final String accept = "application/xml";
+        String includeConverted =
+                JacksonAdapter.createDefaultSerializerAdapter().serializeList(include, CollectionFormat.CSV);
         return service.listFilesAndDirectoriesSegment(
                 this.client.getUrl(),
                 restype,
@@ -448,6 +460,8 @@ public Mono<DirectoriesListFilesAndDirectoriesSegmentResponse> listFilesAndDirec
                 maxresults,
                 timeout,
                 this.client.getVersion(),
+                includeConverted,
+                includeExtendedInfo,
                 accept,
                 context);
     }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/FilesImpl.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/FilesImpl.java
index a6422c8682ba..ab2b3ac0cff5 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/FilesImpl.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/FilesImpl.java
@@ -45,11 +45,10 @@
 import com.azure.storage.file.share.models.PermissionCopyModeType;
 import com.azure.storage.file.share.models.ShareFileHttpHeaders;
 import com.azure.storage.file.share.models.SourceModifiedAccessConditions;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import java.nio.ByteBuffer;
 import java.util.Map;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in Files. */
 public final class FilesImpl {
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/DirectoryItem.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/DirectoryItem.java
index 4b8ed214a414..19f7c08ba660 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/DirectoryItem.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/DirectoryItem.java
@@ -18,6 +18,30 @@ public final class DirectoryItem {
     @JsonProperty(value = "Name", required = true)
     private String name;
 
+    /*
+     * The FileId property.
+     */
+    @JsonProperty(value = "FileId")
+    private String fileId;
+
+    /*
+     * File properties.
+     */
+    @JsonProperty(value = "Properties")
+    private FileProperty properties;
+
+    /*
+     * The Attributes property.
+     */
+    @JsonProperty(value = "Attributes")
+    private String attributes;
+
+    /*
+     * The PermissionKey property.
+     */
+    @JsonProperty(value = "PermissionKey")
+    private String permissionKey;
+
     /**
      * Get the name property: The Name property.
      *
@@ -37,4 +61,84 @@ public DirectoryItem setName(String name) {
         this.name = name;
         return this;
     }
+
+    /**
+     * Get the fileId property: The FileId property.
+     *
+     * @return the fileId value.
+     */
+    public String getFileId() {
+        return this.fileId;
+    }
+
+    /**
+     * Set the fileId property: The FileId property.
+     *
+     * @param fileId the fileId value to set.
+     * @return the DirectoryItem object itself.
+     */
+    public DirectoryItem setFileId(String fileId) {
+        this.fileId = fileId;
+        return this;
+    }
+
+    /**
+     * Get the properties property: File properties.
+     *
+     * @return the properties value.
+     */
+    public FileProperty getProperties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: File properties.
+     *
+     * @param properties the properties value to set.
+     * @return the DirectoryItem object itself.
+     */
+    public DirectoryItem setProperties(FileProperty properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the attributes property: The Attributes property.
+     *
+     * @return the attributes value.
+     */
+    public String getAttributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Set the attributes property: The Attributes property.
+     *
+     * @param attributes the attributes value to set.
+     * @return the DirectoryItem object itself.
+     */
+    public DirectoryItem setAttributes(String attributes) {
+        this.attributes = attributes;
+        return this;
+    }
+
+    /**
+     * Get the permissionKey property: The PermissionKey property.
+     *
+     * @return the permissionKey value.
+     */
+    public String getPermissionKey() {
+        return this.permissionKey;
+    }
+
+    /**
+     * Set the permissionKey property: The PermissionKey property.
+     *
+     * @param permissionKey the permissionKey value to set.
+     * @return the DirectoryItem object itself.
+     */
+    public DirectoryItem setPermissionKey(String permissionKey) {
+        this.permissionKey = permissionKey;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileItem.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileItem.java
index 3c956faf0f38..b8609f87e028 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileItem.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileItem.java
@@ -18,12 +18,30 @@ public final class FileItem {
     @JsonProperty(value = "Name", required = true)
     private String name;
 
+    /*
+     * The FileId property.
+     */
+    @JsonProperty(value = "FileId")
+    private String fileId;
+
     /*
      * File properties.
      */
     @JsonProperty(value = "Properties", required = true)
     private FileProperty properties;
 
+    /*
+     * The Attributes property.
+     */
+    @JsonProperty(value = "Attributes")
+    private String attributes;
+
+    /*
+     * The PermissionKey property.
+     */
+    @JsonProperty(value = "PermissionKey")
+    private String permissionKey;
+
     /**
      * Get the name property: The Name property.
      *
@@ -44,6 +62,26 @@ public FileItem setName(String name) {
         return this;
     }
 
+    /**
+     * Get the fileId property: The FileId property.
+     *
+     * @return the fileId value.
+     */
+    public String getFileId() {
+        return this.fileId;
+    }
+
+    /**
+     * Set the fileId property: The FileId property.
+     *
+     * @param fileId the fileId value to set.
+     * @return the FileItem object itself.
+     */
+    public FileItem setFileId(String fileId) {
+        this.fileId = fileId;
+        return this;
+    }
+
     /**
      * Get the properties property: File properties.
      *
@@ -63,4 +101,44 @@ public FileItem setProperties(FileProperty properties) {
         this.properties = properties;
         return this;
     }
+
+    /**
+     * Get the attributes property: The Attributes property.
+     *
+     * @return the attributes value.
+     */
+    public String getAttributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Set the attributes property: The Attributes property.
+     *
+     * @param attributes the attributes value to set.
+     * @return the FileItem object itself.
+     */
+    public FileItem setAttributes(String attributes) {
+        this.attributes = attributes;
+        return this;
+    }
+
+    /**
+     * Get the permissionKey property: The PermissionKey property.
+     *
+     * @return the permissionKey value.
+     */
+    public String getPermissionKey() {
+        return this.permissionKey;
+    }
+
+    /**
+     * Set the permissionKey property: The PermissionKey property.
+     *
+     * @param permissionKey the permissionKey value to set.
+     * @return the FileItem object itself.
+     */
+    public FileItem setPermissionKey(String permissionKey) {
+        this.permissionKey = permissionKey;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileProperty.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileProperty.java
index 80c87e512508..e0b1c58d02f5 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileProperty.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/FileProperty.java
@@ -5,8 +5,10 @@
 package com.azure.storage.file.share.implementation.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.time.OffsetDateTime;
 
 /** File properties. */
 @JacksonXmlRootElement(localName = "FileProperty")
@@ -22,6 +24,42 @@ public final class FileProperty {
     @JsonProperty(value = "Content-Length", required = true)
     private long contentLength;
 
+    /*
+     * The CreationTime property.
+     */
+    @JsonProperty(value = "CreationTime")
+    private OffsetDateTime creationTime;
+
+    /*
+     * The LastAccessTime property.
+     */
+    @JsonProperty(value = "LastAccessTime")
+    private OffsetDateTime lastAccessTime;
+
+    /*
+     * The LastWriteTime property.
+     */
+    @JsonProperty(value = "LastWriteTime")
+    private OffsetDateTime lastWriteTime;
+
+    /*
+     * The ChangeTime property.
+     */
+    @JsonProperty(value = "ChangeTime")
+    private OffsetDateTime changeTime;
+
+    /*
+     * The Last-Modified property.
+     */
+    @JsonProperty(value = "Last-Modified")
+    private DateTimeRfc1123 lastModified;
+
+    /*
+     * The Etag property.
+     */
+    @JsonProperty(value = "Etag")
+    private String etag;
+
     /**
      * Get the contentLength property: Content length of the file. This value may not be up-to-date since an SMB client
      * may have modified the file locally. The value of Content-Length may not reflect that fact until the handle is
@@ -45,4 +83,131 @@ public FileProperty setContentLength(long contentLength) {
         this.contentLength = contentLength;
         return this;
     }
+
+    /**
+     * Get the creationTime property: The CreationTime property.
+     *
+     * @return the creationTime value.
+     */
+    public OffsetDateTime getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * Set the creationTime property: The CreationTime property.
+     *
+     * @param creationTime the creationTime value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setCreationTime(OffsetDateTime creationTime) {
+        this.creationTime = creationTime;
+        return this;
+    }
+
+    /**
+     * Get the lastAccessTime property: The LastAccessTime property.
+     *
+     * @return the lastAccessTime value.
+     */
+    public OffsetDateTime getLastAccessTime() {
+        return this.lastAccessTime;
+    }
+
+    /**
+     * Set the lastAccessTime property: The LastAccessTime property.
+     *
+     * @param lastAccessTime the lastAccessTime value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setLastAccessTime(OffsetDateTime lastAccessTime) {
+        this.lastAccessTime = lastAccessTime;
+        return this;
+    }
+
+    /**
+     * Get the lastWriteTime property: The LastWriteTime property.
+     *
+     * @return the lastWriteTime value.
+     */
+    public OffsetDateTime getLastWriteTime() {
+        return this.lastWriteTime;
+    }
+
+    /**
+     * Set the lastWriteTime property: The LastWriteTime property.
+     *
+     * @param lastWriteTime the lastWriteTime value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setLastWriteTime(OffsetDateTime lastWriteTime) {
+        this.lastWriteTime = lastWriteTime;
+        return this;
+    }
+
+    /**
+     * Get the changeTime property: The ChangeTime property.
+     *
+     * @return the changeTime value.
+     */
+    public OffsetDateTime getChangeTime() {
+        return this.changeTime;
+    }
+
+    /**
+     * Set the changeTime property: The ChangeTime property.
+     *
+     * @param changeTime the changeTime value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setChangeTime(OffsetDateTime changeTime) {
+        this.changeTime = changeTime;
+        return this;
+    }
+
+    /**
+     * Get the lastModified property: The Last-Modified property.
+     *
+     * @return the lastModified value.
+     */
+    public OffsetDateTime getLastModified() {
+        if (this.lastModified == null) {
+            return null;
+        }
+        return this.lastModified.getDateTime();
+    }
+
+    /**
+     * Set the lastModified property: The Last-Modified property.
+     *
+     * @param lastModified the lastModified value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setLastModified(OffsetDateTime lastModified) {
+        if (lastModified == null) {
+            this.lastModified = null;
+        } else {
+            this.lastModified = new DateTimeRfc1123(lastModified);
+        }
+        return this;
+    }
+
+    /**
+     * Get the etag property: The Etag property.
+     *
+     * @return the etag value.
+     */
+    public String getEtag() {
+        return this.etag;
+    }
+
+    /**
+     * Set the etag property: The Etag property.
+     *
+     * @param etag the etag value to set.
+     * @return the FileProperty object itself.
+     */
+    public FileProperty setEtag(String etag) {
+        this.etag = etag;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesAndDirectoriesSegmentResponse.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesAndDirectoriesSegmentResponse.java
index e343fc016ba6..57038fe0f41f 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesAndDirectoriesSegmentResponse.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesAndDirectoriesSegmentResponse.java
@@ -67,6 +67,12 @@ public final class ListFilesAndDirectoriesSegmentResponse {
     @JsonProperty(value = "NextMarker", required = true)
     private String nextMarker;
 
+    /*
+     * The DirectoryId property.
+     */
+    @JsonProperty(value = "DirectoryId")
+    private String directoryId;
+
     /**
      * Get the serviceEndpoint property: The ServiceEndpoint property.
      *
@@ -246,4 +252,24 @@ public ListFilesAndDirectoriesSegmentResponse setNextMarker(String nextMarker) {
         this.nextMarker = nextMarker;
         return this;
     }
+
+    /**
+     * Get the directoryId property: The DirectoryId property.
+     *
+     * @return the directoryId value.
+     */
+    public String getDirectoryId() {
+        return this.directoryId;
+    }
+
+    /**
+     * Set the directoryId property: The DirectoryId property.
+     *
+     * @param directoryId the directoryId value to set.
+     * @return the ListFilesAndDirectoriesSegmentResponse object itself.
+     */
+    public ListFilesAndDirectoriesSegmentResponse setDirectoryId(String directoryId) {
+        this.directoryId = directoryId;
+        return this;
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesIncludeType.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesIncludeType.java
new file mode 100644
index 000000000000..50bfdb1440fa
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/ListFilesIncludeType.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.file.share.implementation.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/** Defines values for ListFilesIncludeType. */
+public enum ListFilesIncludeType {
+    /** Enum value Timestamps. */
+    TIMESTAMPS("Timestamps"),
+
+    /** Enum value Etag. */
+    ETAG("Etag"),
+
+    /** Enum value Attributes. */
+    ATTRIBUTES("Attributes"),
+
+    /** Enum value PermissionKey. */
+    PERMISSION_KEY("PermissionKey");
+
+    /** The actual serialized value for a ListFilesIncludeType instance. */
+    private final String value;
+
+    ListFilesIncludeType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a ListFilesIncludeType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ListFilesIncludeType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static ListFilesIncludeType fromString(String value) {
+        ListFilesIncludeType[] items = ListFilesIncludeType.values();
+        for (ListFilesIncludeType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java
index 5d53544ca68f..89eaac8aaea2 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java
@@ -11,10 +11,12 @@
 import com.azure.storage.common.implementation.Constants;
 import com.azure.storage.common.implementation.StorageImplUtils;
 import com.azure.storage.file.share.implementation.models.DeleteSnapshotsOptionType;
+import com.azure.storage.file.share.implementation.models.FileProperty;
 import com.azure.storage.file.share.implementation.models.ServicesListSharesSegmentHeaders;
 import com.azure.storage.file.share.implementation.models.ShareItemInternal;
 import com.azure.storage.file.share.implementation.models.SharePropertiesInternal;
 import com.azure.storage.file.share.models.ShareFileDownloadHeaders;
+import com.azure.storage.file.share.models.ShareFileItemProperties;
 import com.azure.storage.file.share.models.ShareItem;
 import com.azure.storage.file.share.models.ShareProperties;
 import com.azure.storage.file.share.models.ShareProtocols;
@@ -188,4 +190,12 @@ public static ShareFileDownloadHeaders transformFileDownloadHeaders(HttpHeaders
             throw LOGGER.logExceptionAsError(new RuntimeException(e));
         }
     }
+
+    public static ShareFileItemProperties transformFileProperty(FileProperty property) {
+        if (property == null) {
+            return null;
+        }
+        return new ShareFileItemProperties(property.getCreationTime(), property.getLastAccessTime(),
+            property.getLastWriteTime(), property.getChangeTime(), property.getLastModified(), property.getEtag());
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItem.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItem.java
index 813a339eb0be..13ff60e76667 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItem.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItem.java
@@ -5,6 +5,8 @@
 
 import com.azure.core.annotation.Immutable;
 
+import java.util.EnumSet;
+
 /**
  * Contains file or directory reference information in the storage File service.
  */
@@ -12,6 +14,10 @@
 public final class ShareFileItem {
     private final String name;
     private final boolean isDirectory;
+    private final String id;
+    private final ShareFileItemProperties properties;
+    private final EnumSet<NtfsFileAttributes> fileAttributes;
+    private final String permissionKey;
     private final Long fileSize;
 
     /**
@@ -22,8 +28,28 @@ public final class ShareFileItem {
      * @param fileSize Size of a file. Pass {@code null} if the reference is a directory.
      */
     public ShareFileItem(final String name, final boolean isDirectory, final Long fileSize) {
+        this(name, isDirectory, null, null, null, null, fileSize);
+    }
+
+    /**
+     * Creates an instance of file or directory reference information about a specific Share.
+     *
+     * @param name Name of the file or the directory.
+     * @param isDirectory A boolean set to true if the reference is a directory, false if the reference is a file.
+     * @param id ID of the file or directory.
+     * @param properties Properties of the file or directory.
+     * @param fileAttributes NTFS attributes of the file or directory.
+     * @param permissionKey Permission key of the file or directory.
+     * @param fileSize Size of a file. Pass {@code null} if the reference is a directory.
+     */
+    public ShareFileItem(final String name, final boolean isDirectory, String id, ShareFileItemProperties properties,
+        EnumSet<NtfsFileAttributes> fileAttributes, String permissionKey, final Long fileSize) {
         this.name = name;
         this.isDirectory = isDirectory;
+        this.id = id;
+        this.properties = properties;
+        this.fileAttributes = fileAttributes;
+        this.permissionKey = permissionKey;
         this.fileSize = fileSize;
     }
 
@@ -48,4 +74,31 @@ public Long getFileSize() {
         return fileSize;
     }
 
+    /**
+     * @return ID of the file or directory.
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @return Properties of the file or directory.
+     */
+    public ShareFileItemProperties getProperties() {
+        return properties;
+    }
+
+    /**
+     * @return NTFS attributes of the file or directory.
+     */
+    public EnumSet<NtfsFileAttributes> getFileAttributes() {
+        return fileAttributes;
+    }
+
+    /**
+     * @return Permission key of the file or directory.
+     */
+    public String getPermissionKey() {
+        return permissionKey;
+    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItemProperties.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItemProperties.java
new file mode 100644
index 000000000000..69b9c5dd08e0
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareFileItemProperties.java
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.file.share.models;
+
+import java.time.OffsetDateTime;
+
+/**
+ * Share item properties for items on a listing operation.
+ */
+public class ShareFileItemProperties {
+    private final OffsetDateTime createdOn;
+    private final OffsetDateTime lastAccessedOn;
+    private final OffsetDateTime lastWrittenOn;
+    private final OffsetDateTime changedOn;
+    private final OffsetDateTime lastModified;
+    private final String eTag;
+
+    /**
+     * Creates an instance of share item properties.
+     *
+     * @param createdOn Datetime the item was created.
+     * @param lastAccessedOn Datetime the item was last accessed.
+     * @param lastWrittenOn Datetime the item was last written.
+     * @param changedOn Datetime the item was last changed.
+     * @param lastModified Datetime the item was last modified.
+     * @param eTag ETag of the item.
+     */
+    public ShareFileItemProperties(OffsetDateTime createdOn, OffsetDateTime lastAccessedOn,
+        OffsetDateTime lastWrittenOn, OffsetDateTime changedOn, OffsetDateTime lastModified, String eTag) {
+        this.createdOn = createdOn;
+        this.lastAccessedOn = lastAccessedOn;
+        this.lastWrittenOn = lastWrittenOn;
+        this.changedOn = changedOn;
+        this.lastModified = lastModified;
+        this.eTag = eTag;
+    }
+
+    /**
+     * @return Datetime this item was created.
+     */
+    public OffsetDateTime getCreatedOn() {
+        return createdOn;
+    }
+
+    /**
+     * @return Datetime this item was last accessed.
+     */
+    public OffsetDateTime getLastAccessedOn() {
+        return lastAccessedOn;
+    }
+
+    /**
+     * @return Datetime this item was last written.
+     */
+    public OffsetDateTime getLastWrittenOn() {
+        return lastWrittenOn;
+    }
+
+    /**
+     * @return Datetime this item was last changed.
+     */
+    public OffsetDateTime getChangedOn() {
+        return changedOn;
+    }
+
+    /**
+     * @return Datetime this item was last modified.
+     */
+    public OffsetDateTime getLastModified() {
+        return lastModified;
+    }
+
+    /**
+     * @return ETag of this item.
+     */
+    public String getETag() {
+        return eTag;
+    }
+}
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/options/ShareListFilesAndDirectoriesOptions.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/options/ShareListFilesAndDirectoriesOptions.java
new file mode 100644
index 000000000000..a274505e5282
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/options/ShareListFilesAndDirectoriesOptions.java
@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.file.share.options;
+
+import com.azure.core.util.logging.ClientLogger;
+
+/**
+ * Extended options for a directory listing operation.
+ */
+public class ShareListFilesAndDirectoriesOptions {
+    private final ClientLogger logger = new ClientLogger(ShareListFilesAndDirectoriesOptions.class);
+
+    private String prefix;
+    private Integer maxResultsPerPage;
+    private boolean includeTimestamps;
+    private boolean includeETag;
+    private boolean includeAttributes;
+    private boolean includePermissionKey;
+    private Boolean includeExtendedInfo;
+
+    /**
+     * @return prefix for this listing operation.
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
+    /**
+     * Sets the prefix for a listing operation.
+     *
+     * @param prefix the prefix.
+     * @return updated options.
+     */
+    public ShareListFilesAndDirectoriesOptions setPrefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    /**
+     * @return max results per page for this listing operation.
+     */
+    public Integer getMaxResultsPerPage() {
+        return maxResultsPerPage;
+    }
+
+    /**
+     * Sets the max results per page for a listing operation.
+     *
+     * @param maxResultsPerPage the max results per page.
+     * @return updated options.
+     */
+    public ShareListFilesAndDirectoriesOptions setMaxResultsPerPage(Integer maxResultsPerPage) {
+        this.maxResultsPerPage = maxResultsPerPage;
+        return this;
+    }
+
+    /**
+     * Note that setting timestamps, etag, attributes, or permission key will also set this option as true. Attempting
+     * to set it back to false while any of these options are true will be unsuccessful.
+     *
+     * Including extended info in a listing operation can result in a more expensive operation, but will present
+     * more accurate information on the listing item.
+     *
+     * @return whether to include extended info on this listing operation.
+     */
+    public Boolean includeExtendedInfo() {
+        return includeExtendedInfo;
+    }
+
+    /**
+     * Note that setting timestamps, etag, attributes, or permission key will also set this option as true. Attempting
+     * to set it back to false will be unsuccessful.
+     *
+     * Sets the prefix for a listing operation.
+     *
+     * Including extended info in a listing operation can result in a more expensive operation, but will present
+     * more accurate information on the listing item.
+     *
+     * @param includeExtendedInfo whether to include extended info.
+     * @return updated options.
+     * @throws IllegalStateException Throws when attempting to set null when other parameters require it to be true.
+     */
+    public ShareListFilesAndDirectoriesOptions setIncludeExtendedInfo(Boolean includeExtendedInfo) {
+        if (includeTimestamps || includeETag || includeAttributes || includePermissionKey) {
+            throw logger.logExceptionAsError(
+                new IllegalStateException("includeExtendedInfo must be true in the current state."));
+        }
+        this.includeExtendedInfo = includeExtendedInfo;
+        return this;
+    }
+
+    /**
+     * @return whether to include timestamps on this listing operation.
+     */
+    public boolean includeTimestamps() {
+        return includeTimestamps;
+    }
+
+    /**
+     * @param includeTimestamps whether to include timestamps on this listing operation.
+     * @return updated options
+     */
+    public ShareListFilesAndDirectoriesOptions setIncludeTimestamps(boolean includeTimestamps) {
+        this.includeTimestamps = includeTimestamps;
+        if (includeTimestamps) {
+            this.includeExtendedInfo = true;
+        }
+        return this;
+    }
+
+    /**
+     * @return whether to include the etag on this listing operation.
+     */
+    public boolean includeETag() {
+        return includeETag;
+    }
+
+    /**
+     * @param includeETag whether to include the etag on this listing operation.
+     * @return updated options
+     */
+    public ShareListFilesAndDirectoriesOptions setIncludeETag(boolean includeETag) {
+        this.includeETag = includeETag;
+        if (includeETag) {
+            this.includeExtendedInfo = true;
+        }
+        return this;
+    }
+
+    /**
+     * @return whether to include file attributes on this listing operation.
+     */
+    public boolean includeAttributes() {
+        return includeAttributes;
+    }
+
+    /**
+     * @param includeAttributes whether to include file attributes on this listing operation.
+     * @return updated options
+     */
+    public ShareListFilesAndDirectoriesOptions setIncludeAttributes(boolean includeAttributes) {
+        this.includeAttributes = includeAttributes;
+        if (includeAttributes) {
+            this.includeExtendedInfo = true;
+        }
+        return this;
+    }
+
+    /**
+     * @return whether to include the permission key on this listing operation.
+     */
+    public boolean includePermissionKey() {
+        return includePermissionKey;
+    }
+
+    /**
+     * @param includePermissionKey whether to include the permission key on this listing operation.
+     * @return updated options
+     */
+    public ShareListFilesAndDirectoriesOptions setIncludePermissionKey(boolean includePermissionKey) {
+        this.includePermissionKey = includePermissionKey;
+        if (includePermissionKey) {
+            this.includeExtendedInfo = true;
+        }
+        return this;
+    }
+}
diff --git a/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryAsyncJavaDocCodeSamples.java b/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryAsyncJavaDocCodeSamples.java
index ca954b15126f..c6e3cad55cda 100644
--- a/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryAsyncJavaDocCodeSamples.java
+++ b/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryAsyncJavaDocCodeSamples.java
@@ -7,6 +7,7 @@
 import com.azure.storage.file.share.models.NtfsFileAttributes;
 import com.azure.storage.file.share.models.ShareFileHttpHeaders;
 import com.azure.storage.file.share.models.ShareRequestConditions;
+import com.azure.storage.file.share.options.ShareListFilesAndDirectoriesOptions;
 import com.azure.storage.file.share.sas.ShareFileSasPermission;
 import com.azure.storage.file.share.sas.ShareServiceSasSignatureValues;
 
@@ -276,6 +277,22 @@ public void listDirectoriesAndFilesAsyncMaxOverload() {
         // END: com.azure.storage.file.share.ShareDirectoryAsyncClient.listFilesAndDirectories#string-integer
     }
 
+    /**
+     * Generates a code sample for using {@link ShareDirectoryAsyncClient#listFilesAndDirectories(
+     *ShareListFilesAndDirectoriesOptions)}
+     */
+    public void listDirectoriesAndFilesAsyncOptionsBagOverload() {
+        ShareDirectoryAsyncClient shareDirectoryAsyncClient = createAsyncClientWithSASToken();
+        // BEGIN: com.azure.storage.file.share.ShareDirectoryAsyncClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions
+        shareDirectoryAsyncClient.listFilesAndDirectories(new ShareListFilesAndDirectoriesOptions()
+            .setPrefix("subdir").setMaxResultsPerPage(10))
+            .subscribe(fileRef -> System.out.printf("Is the resource a directory? %b. The resource name is: %s.",
+                fileRef.isDirectory(), fileRef.getName()),
+                error -> System.err.println(error.toString()),
+                () -> System.out.println("Completed listing the directories and files."));
+        // END: com.azure.storage.file.share.ShareDirectoryAsyncClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions
+    }
+
     /**
      * Generates a code sample for using {@link ShareDirectoryAsyncClient#deleteFile(String)} ()}
      */
diff --git a/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryJavaDocCodeSamples.java b/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryJavaDocCodeSamples.java
index f6551ccb8e10..d6f1c1271e89 100644
--- a/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryJavaDocCodeSamples.java
+++ b/sdk/storage/azure-storage-file-share/src/samples/java/com/azure/storage/file/share/ShareDirectoryJavaDocCodeSamples.java
@@ -13,6 +13,7 @@
 import com.azure.storage.file.share.models.HandleItem;
 import com.azure.storage.file.share.models.NtfsFileAttributes;
 import com.azure.storage.file.share.models.ShareRequestConditions;
+import com.azure.storage.file.share.options.ShareListFilesAndDirectoriesOptions;
 import com.azure.storage.file.share.sas.ShareFileSasPermission;
 import com.azure.storage.file.share.sas.ShareServiceSasSignatureValues;
 
@@ -265,6 +266,20 @@ public void listDirectoriesAndFilesMaxOverload() {
         // END: com.azure.storage.file.share.ShareDirectoryClient.listFilesAndDirectories#string-integer-duration-context
     }
 
+    /**
+     * Generates a code sample for using {@link ShareDirectoryClient#listFilesAndDirectories(
+     * ShareListFilesAndDirectoriesOptions, Duration, Context)}
+     */
+    public void listDirectoriesAndFilesOptionsBagOverload() {
+        ShareDirectoryClient shareDirectoryClient = createClientWithSASToken();
+        // BEGIN: com.azure.storage.file.share.ShareDirectoryClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions-duration-context
+        shareDirectoryClient.listFilesAndDirectories(new ShareListFilesAndDirectoriesOptions()
+                .setPrefix("subdir").setMaxResultsPerPage(10), Duration.ofSeconds(1), new Context(key1, value1))
+            .forEach(fileRef -> System.out.printf("Is the resource a directory? %b. The resource name is: %s.",
+                fileRef.isDirectory(), fileRef.getName()));
+        // END: com.azure.storage.file.share.ShareDirectoryClient.listFilesAndDirectories#ShareListFilesAndDirectoriesOptions-duration-context
+    }
+
     /**
      * Generates a code sample for using {@link ShareDirectoryClient#deleteFile(String)} ()}
      */
diff --git a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryAPITests.groovy b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryAPITests.groovy
index 163c16e7fdf6..4ee1c1bf8d1a 100644
--- a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryAPITests.groovy
+++ b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryAPITests.groovy
@@ -6,16 +6,20 @@ package com.azure.storage.file.share
 import com.azure.storage.common.StorageSharedKeyCredential
 import com.azure.storage.common.implementation.Constants
 import com.azure.storage.common.test.shared.extensions.RequiredServiceVersion
+
 import com.azure.storage.file.share.models.ShareErrorCode
 import com.azure.storage.file.share.models.ShareFileHttpHeaders
 import com.azure.storage.file.share.models.NtfsFileAttributes
+import com.azure.storage.file.share.models.ShareFileItem
 import com.azure.storage.file.share.models.ShareSnapshotInfo
 import com.azure.storage.file.share.models.ShareStorageException
+import com.azure.storage.file.share.options.ShareListFilesAndDirectoriesOptions
 import spock.lang.Unroll
 
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
+import java.util.stream.Collectors
 
 class DirectoryAPITests extends APISpec {
     ShareDirectoryClient primaryDirectoryClient
@@ -380,7 +384,7 @@ class DirectoryAPITests extends APISpec {
     def "List files and directories args"() {
         given:
         primaryDirectoryClient.create()
-        def nameList = new LinkedList()
+        def nameList = [] as List<String>
         def dirPrefix = namer.getRandomName(60)
         for (int i = 0; i < 2; i++) {
             def subDirClient = primaryDirectoryClient.getSubdirectoryClient(dirPrefix + i)
@@ -392,23 +396,91 @@ class DirectoryAPITests extends APISpec {
         }
         primaryDirectoryClient.createFile(dirPrefix + 2, 1024)
         for (int i = 0; i < 3; i++) {
-            nameList.add(dirPrefix + i)
+            nameList << (dirPrefix + i)
         }
 
         when:
-        def fileRefIter = primaryDirectoryClient.listFilesAndDirectories(namer.getResourcePrefix() + extraPrefix, maxResults, null, null).iterator()
+        def options = new ShareListFilesAndDirectoriesOptions()
+            .setPrefix(namer.getResourcePrefix() + extraPrefix)
+            .setMaxResultsPerPage(maxResults)
+            .setIncludeExtendedInfo(includeExtendedInfo) // set FIRST since subsequent can autoset this one
+            .setIncludeTimestamps(timestamps)
+            .setIncludeETag(etag)
+            .setIncludeAttributes(attributes)
+            .setIncludePermissionKey(permissionKey)
+        def returnedFileList = primaryDirectoryClient.listFilesAndDirectories(options, null, null).collect()
 
         then:
-        for (int i = 0; i < numOfResults; i++) {
-            Objects.equals(nameList.pop(), fileRefIter.next().getName())
+        options.includeExtendedInfo() == includeExtendedInfoIsTrue
+        if (expectingResults) {
+            assert nameList == returnedFileList*.getName()
+        }
+        else {
+            assert returnedFileList.size() == 0
         }
-        !fileRefIter.hasNext()
 
         where:
-        extraPrefix   | maxResults | numOfResults
-        ""            | null       | 3
-        ""            | 1          | 3
-        "noOp"        | 3          | 0
+        extraPrefix | maxResults | timestamps | etag  | attributes | permissionKey | includeExtendedInfo || includeExtendedInfoIsTrue | expectingResults
+        ""          | null       | false      | false | false      | false         | null                || null                      | true
+        ""          | 1          | false      | false | false      | false         | null                || null                      | true
+        "noOp"      | 3          | false      | false | false      | false         | null                || null                      | false
+        ""          | null       | true       | false | false      | false         | null                || true                      | true
+        ""          | null       | false      | true  | false      | false         | null                || true                      | true
+        ""          | null       | false      | false | true       | false         | null                || true                      | true
+        ""          | null       | false      | false | false      | true          | null                || true                      | true
+        ""          | null       | true       | true  | true       | true          | null                || true                      | true
+        ""          | null       | false      | false | false      | false         | true                || true                      | true
+    }
+
+    def "List files and directories extended info results"() {
+        given:
+        def parentDir = primaryDirectoryClient
+        parentDir.create()
+        def file = parentDir.createFile(namer.getRandomName(60), 1024)
+        def dir = parentDir.createSubdirectory(namer.getRandomName(60))
+
+        when:
+        def listResults = parentDir.listFilesAndDirectories(
+            new ShareListFilesAndDirectoriesOptions()
+                .setIncludeExtendedInfo(true).setIncludeTimestamps(true).setIncludePermissionKey(true).setIncludeETag(true)
+                .setIncludeAttributes(true),
+            null, null)
+            .stream().collect(Collectors.toList())
+
+        then:
+        ShareFileItem dirListItem
+        ShareFileItem fileListItem
+        if (listResults[0].isDirectory()) {
+            dirListItem = listResults[0]
+            fileListItem = listResults[1]
+        } else {
+            dirListItem = listResults[1]
+            fileListItem = listResults[0]
+        }
+
+        new File(dir.getDirectoryPath()).getName() == dirListItem.getName()
+        dirListItem.isDirectory()
+        dirListItem.getId() && !dirListItem.getId().allWhitespace
+        EnumSet.of(NtfsFileAttributes.DIRECTORY) == dirListItem.fileAttributes
+        dirListItem.getPermissionKey() && !dirListItem.getPermissionKey().allWhitespace
+        dirListItem.getProperties().getCreatedOn()
+        dirListItem.getProperties().getLastAccessedOn()
+        dirListItem.getProperties().getLastWrittenOn()
+        dirListItem.getProperties().getChangedOn()
+        dirListItem.getProperties().getLastModified()
+        dirListItem.getProperties().getETag() && !dirListItem.getProperties().getETag().allWhitespace
+
+        new File(file.getFilePath()).getName() == fileListItem.getName()
+        !fileListItem.isDirectory()
+        fileListItem.getId() && !fileListItem.getId().allWhitespace
+        EnumSet.of(NtfsFileAttributes.ARCHIVE) == fileListItem.fileAttributes
+        fileListItem.getPermissionKey() && !fileListItem.getPermissionKey().allWhitespace
+        fileListItem.getProperties().getCreatedOn()
+        fileListItem.getProperties().getLastAccessedOn()
+        fileListItem.getProperties().getLastWrittenOn()
+        fileListItem.getProperties().getChangedOn()
+        fileListItem.getProperties().getLastModified()
+        fileListItem.getProperties().getETag() && !fileListItem.getProperties().getETag().allWhitespace
     }
 
     def "List max results by page"() {
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[0].json
index a2931b8f4a46..e41cd660332a 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[0].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[0].json
@@ -1,318 +1,278 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "d02145dd-fbb0-4ec1-90b0-cb9567083571"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9e0cfe05-2230-4e07-a1ed-261864236928"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910031CA6F4A2",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "eTag" : "0x8D92791D1058BEC",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "9ef28ed7-901a-0064-0eeb-413b29000000",
-      "x-ms-client-request-id" : "d02145dd-fbb0-4ec1-90b0-cb9567083571",
-      "Date" : "Wed, 05 May 2021 20:19:39 GMT"
+      "x-ms-request-id" : "c6d2de5e-501a-001c-7e7a-59e384000000",
+      "x-ms-client-request-id" : "9e0cfe05-2230-4e07-a1ed-261864236928",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "79c6d528-4a15-4126-8564-e23d8d55f795"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a3f77b7d-cfd4-4b4b-9e01-d29237f3e8c6"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.2185092Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.2717450Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:39 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.2185092Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.2717450Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D910031CB4AD84",
-      "x-ms-request-id" : "edeb589b-d01a-0038-41eb-416e71000000",
-      "x-ms-client-request-id" : "79c6d528-4a15-4126-8564-e23d8d55f795",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.2185092Z"
+      "eTag" : "0x8D92791D12C490A",
+      "x-ms-request-id" : "2667989e-501a-0003-567a-59a3d1000000",
+      "x-ms-client-request-id" : "a3f77b7d-cfd4-4b4b-9e01-d29237f3e8c6",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.2717450Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a0?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a820?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "58169ec4-106d-4847-87a0-cd2310e7085a"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3f689a3d-0668-4a70-90d5-be441857a2a5"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
-      "x-ms-file-id" : "13835093239654252544",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.3045713Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3756850Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:39 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.3045713Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3756850Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031CC1CF51",
-      "x-ms-request-id" : "a0ad10bb-f01a-004d-1feb-41055d000000",
-      "x-ms-client-request-id" : "58169ec4-106d-4847-87a0-cd2310e7085a",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.3045713Z"
+      "eTag" : "0x8D92791D13C2532",
+      "x-ms-request-id" : "266798a0-501a-0003-577a-59a3d1000000",
+      "x-ms-client-request-id" : "3f689a3d-0668-4a70-90d5-be441857a2a5",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3756850Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a0%2F39f631bd39f631bd16660112e00bc44e0240435d8a3",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a820%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a823",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fc3d152f-478c-46d5-9df7-e2e817a5a206"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "cac6cb04-ef7c-4941-9ec1-a9861b255aa1"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835163608398430208",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.4396668Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5226003Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:39 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.4396668Z",
-      "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031CD66C7C",
-      "x-ms-request-id" : "53b03bfa-d01a-0017-4feb-4163ba000000",
-      "x-ms-client-request-id" : "fc3d152f-478c-46d5-9df7-e2e817a5a206",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.4396668Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5226003Z",
+      "x-ms-file-parent-id" : "11529285414812647424",
+      "eTag" : "0x8D92791D1529013",
+      "x-ms-request-id" : "f92279b8-701a-002e-177a-59103a000000",
+      "x-ms-client-request-id" : "cac6cb04-ef7c-4941-9ec1-a9861b255aa1",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5226003Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a0%2F39f631bd39f631bd16660112e00bc44e0240435d8a4",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a820%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a824",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3c21a29c-85b8-4b27-80dc-b82c3727d1e2"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a8b71c7f-22f8-40a6-bb67-3892c4bf0a38"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "11529320599184736256",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.5397386Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6315378Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:39 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.5397386Z",
-      "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031CE5B18A",
-      "x-ms-request-id" : "53b03bfc-d01a-0017-50eb-4163ba000000",
-      "x-ms-client-request-id" : "3c21a29c-85b8-4b27-80dc-b82c3727d1e2",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.5397386Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6315378Z",
+      "x-ms-file-parent-id" : "11529285414812647424",
+      "eTag" : "0x8D92791D1632F72",
+      "x-ms-request-id" : "5079ffe6-a01a-0005-6e7a-59e2e0000000",
+      "x-ms-client-request-id" : "a8b71c7f-22f8-40a6-bb67-3892c4bf0a38",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6315378Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a1?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a821?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "0f44d707-a952-4883-bcd2-95a4cfa6827f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fa0cadad-d6e7-4a34-a9b0-0e31417c9e22"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
-      "x-ms-file-id" : "13835075647468208128",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "16140971433240035328",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.6428123Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7304807Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.6428123Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7304807Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031CF56BDB",
-      "x-ms-request-id" : "c82a9308-701a-0053-2deb-41e985000000",
-      "x-ms-client-request-id" : "0f44d707-a952-4883-bcd2-95a4cfa6827f",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.6428123Z"
+      "eTag" : "0x8D92791D1724867",
+      "x-ms-request-id" : "266798a7-501a-0003-5b7a-59a3d1000000",
+      "x-ms-client-request-id" : "fa0cadad-d6e7-4a34-a9b0-0e31417c9e22",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7304807Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a1%2F39f631bd39f631bd16660112e00bc44e0240435d8a5",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a821%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a825",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "4a1308e7-5bd4-4299-8f2a-169a9fe24049"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "79e5f022-1075-497d-b13e-5ca4afddec42"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835146016212385792",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529250230440558592",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.7268731Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8614053Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.7268731Z",
-      "x-ms-file-parent-id" : "13835075647468208128",
-      "eTag" : "0x8D910031D023F7B",
-      "x-ms-request-id" : "5fe79b09-001a-0066-49eb-418591000000",
-      "x-ms-client-request-id" : "4a1308e7-5bd4-4299-8f2a-169a9fe24049",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.7268731Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8614053Z",
+      "x-ms-file-parent-id" : "16140971433240035328",
+      "eTag" : "0x8D92791D18642A5",
+      "x-ms-request-id" : "f92279bf-701a-002e-1b7a-59103a000000",
+      "x-ms-client-request-id" : "79e5f022-1075-497d-b13e-5ca4afddec42",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8614053Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a1%2F39f631bd39f631bd16660112e00bc44e0240435d8a6",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a821%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a826",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "55c8f4c2-f683-41ee-a292-5a48f4122e8d"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c52841f8-a870-43a2-83ff-8c384581fc11"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835110831840296960",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.8059309Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9703428Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.8059309Z",
-      "x-ms-file-parent-id" : "13835075647468208128",
-      "eTag" : "0x8D910031D0E4FAD",
-      "x-ms-request-id" : "324ddc7c-401a-0015-70eb-41dd02000000",
-      "x-ms-client-request-id" : "55c8f4c2-f683-41ee-a292-5a48f4122e8d",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.8059309Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9703428Z",
+      "x-ms-file-parent-id" : "16140971433240035328",
+      "eTag" : "0x8D92791D196E204",
+      "x-ms-request-id" : "5079ffec-a01a-0005-727a-59e2e0000000",
+      "x-ms-client-request-id" : "c52841f8-a870-43a2-83ff-8c384581fc11",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9703428Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982%2F39f631bd39f631bd16660112e00bc44e0240435d8a2",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6%2F39f631bd39f631bd36f67159ed3f8a9f79ac419a822",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "b9694649-73e6-4537-a16e-46c0c3e0731b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b5c5da81-f507-4d2d-92a6-7cc65f55216f"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835181200584474624",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:40.8849861Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0572930Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:40.8849861Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0572930Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031D1A5FC5",
-      "x-ms-request-id" : "6442f147-001a-0076-15eb-4140f9000000",
-      "x-ms-client-request-id" : "b9694649-73e6-4537-a16e-46c0c3e0731b",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:40.8849861Z"
+      "eTag" : "0x8D92791D1A42682",
+      "x-ms-request-id" : "0c0bd3b4-001a-0007-137a-59dd0f000000",
+      "x-ms-client-request-id" : "b5c5da81-f507-4d2d-92a6-7cc65f55216f",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0572930Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a/39f631bd39f631bd166617164e4649e7dfc749b982?restype=directory&comp=list&prefix=39f631bd",
+    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd36f127205fd877079b804a66ba/39f631bd39f631bd36f72529cb9d4259bcf54a35a6?restype=directory&comp=list&prefix=39f631bd",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "3bbc0db7-9d96-4a97-8905-4e92dc9cc845"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8c4fb9d6-3168-4b5a-b054-ce3c50029311"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "ef935b56-001a-0059-79eb-414d32000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\" ShareName=\"39f631bd39f631bd166929843f7f5c78120d4d6d9a\" DirectoryPath=\"39f631bd39f631bd166617164e4649e7dfc749b982\"><Prefix>39f631bd</Prefix><Entries><Directory><Name>39f631bd39f631bd16660112e00bc44e0240435d8a0</Name><Properties /></Directory><Directory><Name>39f631bd39f631bd16660112e00bc44e0240435d8a1</Name><Properties /></Directory><File><Name>39f631bd39f631bd16660112e00bc44e0240435d8a2</Name><Properties><Content-Length>1024</Content-Length></Properties></File></Entries><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "3bbc0db7-9d96-4a97-8905-4e92dc9cc845",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
+      "x-ms-request-id" : "d927019a-d01a-0012-177a-59af7f000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"39f631bd39f631bd36f127205fd877079b804a66ba\" DirectoryPath=\"39f631bd39f631bd36f72529cb9d4259bcf54a35a6\"><Prefix>39f631bd</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>39f631bd39f631bd36f67159ed3f8a9f79ac419a820</Name><FileId>11529285414812647424</FileId><Properties /></Directory><Directory><Name>39f631bd39f631bd36f67159ed3f8a9f79ac419a821</Name><FileId>16140971433240035328</FileId><Properties /></Directory><File><Name>39f631bd39f631bd36f67159ed3f8a9f79ac419a822</Name><FileId>13835075647468208128</FileId><Properties><Content-Length>1024</Content-Length></Properties></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "8c4fb9d6-3168-4b5a-b054-ce3c50029311",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=39f631bd&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "56ce6654-3d43-4b79-a01d-87622ee0754a"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "d97a4b0a-801a-0078-46eb-416949000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>39f631bd</Prefix><Shares><Share><Name>39f631bd39f631bd166929843f7f5c78120d4d6d9a</Name><Properties><Last-Modified>Wed, 05 May 2021 20:19:40 GMT</Last-Modified><Etag>\"0x8D910031CA6F4A2\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 20:19:40 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "56ce6654-3d43-4b79-a01d-87622ee0754a",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/39f631bd39f631bd166929843f7f5c78120d4d6d9a?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "affa99a4-4800-43ce-b8ee-a22f1ad83327"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "2c916f56-a01a-0032-3beb-41cac6000000",
-      "x-ms-client-request-id" : "affa99a4-4800-43ce-b8ee-a22f1ad83327",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "39f631bd39f631bd166929843f7f5c78120d4d6d9a", "39f631bd39f631bd166617164e4649e7dfc749b982", "39f631bd39f631bd16660112e00bc44e0240435d8a" ]
+  "variables" : [ "39f631bd39f631bd36f127205fd877079b804a66ba", "39f631bd39f631bd36f72529cb9d4259bcf54a35a6", "39f631bd39f631bd36f67159ed3f8a9f79ac419a82" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[1].json
index 46ee714cd18e..6cbf727e1f61 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[1].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[1].json
@@ -1,360 +1,320 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "6cdc0a7e-ee4e-4fc4-a97d-dcd3a9122250"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a320e2ec-54ec-4ebe-bd55-09ff7f45cbc7"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910031D6F417F",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:41 GMT",
+      "eTag" : "0x8D92791D1055688",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "f606c216-201a-004e-38eb-41e439000000",
-      "x-ms-client-request-id" : "6cdc0a7e-ee4e-4fc4-a97d-dcd3a9122250",
-      "Date" : "Wed, 05 May 2021 20:19:40 GMT"
+      "x-ms-request-id" : "d121b8c1-401a-0021-377a-59bb8d000000",
+      "x-ms-client-request-id" : "a320e2ec-54ec-4ebe-bd55-09ff7f45cbc7",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "f1167319-7d11-45db-b9a9-a0d7da789b94"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "635676f0-7081-4e1a-a736-42274c013ca1"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:41.5674748Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:41 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3576956Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:41.5674748Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3576956Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D910031D82837C",
-      "x-ms-request-id" : "35d39904-101a-006a-4beb-411299000000",
-      "x-ms-client-request-id" : "f1167319-7d11-45db-b9a9-a0d7da789b94",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:41.5674748Z"
+      "eTag" : "0x8D92791D139667C",
+      "x-ms-request-id" : "0c0bd3a6-001a-0007-0a7a-59dd0f000000",
+      "x-ms-client-request-id" : "635676f0-7081-4e1a-a736-42274c013ca1",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3576956Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a0?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa90?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9dc84130-82b9-4c20-9c42-0f6f386a9439"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4436c2f2-18f0-4d31-898e-0133f0cc8c3c"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
       "x-ms-file-id" : "13835093239654252544",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:41.6515354Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:41 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4636347Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:41.6515354Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4636347Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031D8F571A",
-      "x-ms-request-id" : "9ef28eec-901a-0064-1aeb-413b29000000",
-      "x-ms-client-request-id" : "9dc84130-82b9-4c20-9c42-0f6f386a9439",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:41.6515354Z"
+      "eTag" : "0x8D92791D14990BB",
+      "x-ms-request-id" : "266798a1-501a-0003-587a-59a3d1000000",
+      "x-ms-client-request-id" : "4436c2f2-18f0-4d31-898e-0133f0cc8c3c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4636347Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a0%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a3",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa90%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa93",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c0702595-d2ea-4cb2-831b-70671c886ad3"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d7c45b11-9cc1-4398-b782-fc69d3eaba45"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
       "x-ms-file-id" : "13835163608398430208",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:41.7976393Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:41 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6115495Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:41.7976393Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6115495Z",
       "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031DA5A249",
-      "x-ms-request-id" : "ad0f3e5a-401a-0067-05eb-41da4d000000",
-      "x-ms-client-request-id" : "c0702595-d2ea-4cb2-831b-70671c886ad3",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:41.7976393Z"
+      "eTag" : "0x8D92791D16022A7",
+      "x-ms-request-id" : "c6d2de80-501a-001c-1d7a-59e384000000",
+      "x-ms-client-request-id" : "d7c45b11-9cc1-4398-b782-fc69d3eaba45",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6115495Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a0%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a4",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa90%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa94",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c3587509-1299-4a13-b662-d2b3b3751dbd"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e32e75d5-5da2-4432-ae8a-77320be6bc01"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835075647468208128",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:41.9387393Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:41 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7124911Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:41.9387393Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7124911Z",
       "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031DBB2A01",
-      "x-ms-request-id" : "03a9d7bf-001a-0004-12eb-4147b6000000",
-      "x-ms-client-request-id" : "c3587509-1299-4a13-b662-d2b3b3751dbd",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:41.9387393Z"
+      "eTag" : "0x8D92791D16F89AF",
+      "x-ms-request-id" : "0c0bd3ae-001a-0007-0f7a-59dd0f000000",
+      "x-ms-client-request-id" : "e32e75d5-5da2-4432-ae8a-77320be6bc01",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7124911Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a1?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa91?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1f5cef05-05d1-41bb-a406-2c469301503e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1fecc47d-2698-4fd0-b8cd-a3e1fcfe745c"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
-      "x-ms-file-id" : "13835146016212385792",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.1168660Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8094354Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.1168660Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8094354Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031DD65814",
-      "x-ms-request-id" : "c7637764-b01a-0011-21eb-415005000000",
-      "x-ms-client-request-id" : "1f5cef05-05d1-41bb-a406-2c469301503e",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.1168660Z"
+      "eTag" : "0x8D92791D17E5492",
+      "x-ms-request-id" : "38a9363a-d01a-002c-0b7a-592fd5000000",
+      "x-ms-client-request-id" : "1fecc47d-2698-4fd0-b8cd-a3e1fcfe745c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8094354Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a1%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a5",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa91%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa95",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1e7e8e2b-2e02-4264-868a-b0e0658d1819"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "17b6d354-6861-47e7-a097-1e539bce015a"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835110831840296960",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.2779807Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9383613Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.2779807Z",
-      "x-ms-file-parent-id" : "13835146016212385792",
-      "eTag" : "0x8D910031DEEED9F",
-      "x-ms-request-id" : "dfc614a9-c01a-0046-5eeb-41fe36000000",
-      "x-ms-client-request-id" : "1e7e8e2b-2e02-4264-868a-b0e0658d1819",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.2779807Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9383613Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D19200BD",
+      "x-ms-request-id" : "d121b8de-401a-0021-4c7a-59bb8d000000",
+      "x-ms-client-request-id" : "17b6d354-6861-47e7-a097-1e539bce015a",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9383613Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a1%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a6",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa91%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa96",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e7e5ffd0-b611-4ba7-8d3c-895e8365ddd3"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "963783fe-1ba5-4ced-9198-b7fef976bc49"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835181200584474624",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.3760504Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0512962Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.3760504Z",
-      "x-ms-file-parent-id" : "13835146016212385792",
-      "eTag" : "0x8D910031DFDE478",
-      "x-ms-request-id" : "edeb58b7-d01a-0038-52eb-416e71000000",
-      "x-ms-client-request-id" : "e7e5ffd0-b611-4ba7-8d3c-895e8365ddd3",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.3760504Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0512962Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D1A33C42",
+      "x-ms-request-id" : "c6d2de99-501a-001c-327a-59e384000000",
+      "x-ms-client-request-id" : "963783fe-1ba5-4ced-9198-b7fef976bc49",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0512962Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8%2F20ed00fc20ed00fc2161008417b4b1565d4f425a9a2",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2%2F20ed00fc20ed00fc266623975cf491ffaeec4cbfa92",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e1b27b35-fc3f-4033-99e3-c018a807b3a7"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4cfe6701-ca64-4db2-a770-8bed99f84a0a"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835066851375185920",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835110831840296960",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.4811244Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.1392455Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.4811244Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.1392455Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031E0DECEC",
-      "x-ms-request-id" : "d97a4b21-801a-0078-55eb-416949000000",
-      "x-ms-client-request-id" : "e1b27b35-fc3f-4033-99e3-c018a807b3a7",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.4811244Z"
+      "eTag" : "0x8D92791D1B0A7C7",
+      "x-ms-request-id" : "5079ffee-a01a-0005-747a-59e2e0000000",
+      "x-ms-client-request-id" : "4cfe6701-ca64-4db2-a770-8bed99f84a0a",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.1392455Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8?restype=directory&comp=list&prefix=20ed00fc&maxresults=1",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2?restype=directory&comp=list&prefix=20ed00fc&maxresults=1",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "1e4a35ee-2413-4feb-bf15-5d828befaedb"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6061ce9c-7411-432a-be12-a12bbcf6d437"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "081e2afb-501a-006b-7aeb-414d45000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc21656911e972facb03454663a0\" DirectoryPath=\"20ed00fc20ed00fc2161584460810e9dbdc043d5a8\"><Prefix>20ed00fc</Prefix><MaxResults>1</MaxResults><Entries><Directory><Name>20ed00fc20ed00fc2161008417b4b1565d4f425a9a0</Name><Properties /></Directory></Entries><NextMarker>1!60!MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMQ--</NextMarker></EnumerationResults>",
-      "x-ms-client-request-id" : "1e4a35ee-2413-4feb-bf15-5d828befaedb",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-request-id" : "38a93643-d01a-002c-117a-592fd5000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc26637377a30f9f2883ed4393af\" DirectoryPath=\"20ed00fc20ed00fc26633926f6385796ba7b480fb2\"><Prefix>20ed00fc</Prefix><MaxResults>1</MaxResults><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>20ed00fc20ed00fc266623975cf491ffaeec4cbfa90</Name><FileId>13835093239654252544</FileId><Properties /></Directory></Entries><NextMarker>1!60!MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5MQ--</NextMarker></EnumerationResults>",
+      "x-ms-client-request-id" : "6061ce9c-7411-432a-be12-a12bbcf6d437",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8?restype=directory&comp=list&prefix=20ed00fc&marker=1%2160%21MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMQ--&maxresults=1",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2?restype=directory&comp=list&prefix=20ed00fc&marker=1%2160%21MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5MQ--&maxresults=1",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "dd1cfbbd-c054-414b-a0cd-8ebb368f3247"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0f8fabca-e46e-4d26-9d3c-c10cc4d62250"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "03a9d7c7-001a-0004-17eb-4147b6000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc21656911e972facb03454663a0\" DirectoryPath=\"20ed00fc20ed00fc2161584460810e9dbdc043d5a8\"><Prefix>20ed00fc</Prefix><Marker>1!60!MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMQ--</Marker><MaxResults>1</MaxResults><Entries><Directory><Name>20ed00fc20ed00fc2161008417b4b1565d4f425a9a1</Name><Properties /></Directory></Entries><NextMarker>1!60!MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMg--</NextMarker></EnumerationResults>",
-      "x-ms-client-request-id" : "dd1cfbbd-c054-414b-a0cd-8ebb368f3247",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-request-id" : "38a93644-d01a-002c-127a-592fd5000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc26637377a30f9f2883ed4393af\" DirectoryPath=\"20ed00fc20ed00fc26633926f6385796ba7b480fb2\"><Prefix>20ed00fc</Prefix><Marker>1!60!MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5MQ--</Marker><MaxResults>1</MaxResults><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>20ed00fc20ed00fc266623975cf491ffaeec4cbfa91</Name><FileId>13835075647468208128</FileId><Properties /></Directory></Entries><NextMarker>1!60!MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5Mg--</NextMarker></EnumerationResults>",
+      "x-ms-client-request-id" : "0f8fabca-e46e-4d26-9d3c-c10cc4d62250",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0/20ed00fc20ed00fc2161584460810e9dbdc043d5a8?restype=directory&comp=list&prefix=20ed00fc&marker=1%2160%21MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMg--&maxresults=1",
+    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc26637377a30f9f2883ed4393af/20ed00fc20ed00fc26633926f6385796ba7b480fb2?restype=directory&comp=list&prefix=20ed00fc&marker=1%2160%21MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5Mg--&maxresults=1",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "87d0110d-2975-483a-b17e-3fe03c467d10"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3d3ccb0d-ba44-4385-8dce-b671c503c42c"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "8b065725-b01a-0001-71eb-41956d000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc21656911e972facb03454663a0\" DirectoryPath=\"20ed00fc20ed00fc2161584460810e9dbdc043d5a8\"><Prefix>20ed00fc</Prefix><Marker>1!60!MjBlZDAwZmMyMGVkMDBmYzIxNjEwMDg0MTdiNGIxNTY1ZDRmNDI1YTlhMg--</Marker><MaxResults>1</MaxResults><Entries><File><Name>20ed00fc20ed00fc2161008417b4b1565d4f425a9a2</Name><Properties><Content-Length>1024</Content-Length></Properties></File></Entries><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "87d0110d-2975-483a-b17e-3fe03c467d10",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-request-id" : "38a93645-d01a-002c-137a-592fd5000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"20ed00fc20ed00fc26637377a30f9f2883ed4393af\" DirectoryPath=\"20ed00fc20ed00fc26633926f6385796ba7b480fb2\"><Prefix>20ed00fc</Prefix><Marker>1!60!MjBlZDAwZmMyMGVkMDBmYzI2NjYyMzk3NWNmNDkxZmZhZWVjNGNiZmE5Mg--</Marker><MaxResults>1</MaxResults><DirectoryId>13835128424026341376</DirectoryId><Entries><File><Name>20ed00fc20ed00fc266623975cf491ffaeec4cbfa92</Name><FileId>13835110831840296960</FileId><Properties><Content-Length>1024</Content-Length></Properties></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "3d3ccb0d-ba44-4385-8dce-b671c503c42c",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=20ed00fc&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "c8f23c5a-0df5-4bc4-a364-4cd37afb30f0"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "9ef28ef8-901a-0064-22eb-413b29000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>20ed00fc</Prefix><Shares><Share><Name>20ed00fc20ed00fc21656911e972facb03454663a0</Name><Properties><Last-Modified>Wed, 05 May 2021 20:19:41 GMT</Last-Modified><Etag>\"0x8D910031D6F417F\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 20:19:41 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "c8f23c5a-0df5-4bc4-a364-4cd37afb30f0",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/20ed00fc20ed00fc21656911e972facb03454663a0?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "5b9a2585-7915-4e81-830b-2f7567e831be"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "4685f244-901a-0016-70eb-413c66000000",
-      "x-ms-client-request-id" : "5b9a2585-7915-4e81-830b-2f7567e831be",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "20ed00fc20ed00fc21656911e972facb03454663a0", "20ed00fc20ed00fc2161584460810e9dbdc043d5a8", "20ed00fc20ed00fc2161008417b4b1565d4f425a9a" ]
+  "variables" : [ "20ed00fc20ed00fc26637377a30f9f2883ed4393af", "20ed00fc20ed00fc26633926f6385796ba7b480fb2", "20ed00fc20ed00fc266623975cf491ffaeec4cbfa9" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[2].json
index 50d41cd74b85..5cbff171ab36 100644
--- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[2].json
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[2].json
@@ -1,318 +1,278 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf?restype=share",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1?restype=share",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ce5f2d24-d4c3-4241-a748-83c0d46fd7a6"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "73650229-c70b-4bd1-904b-1b2e1755e33a"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "eTag" : "0x8D910031E043AAE",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "eTag" : "0x8D92791D1062246",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "a0ad10d9-f01a-004d-32eb-41055d000000",
-      "x-ms-client-request-id" : "ce5f2d24-d4c3-4241-a748-83c0d46fd7a6",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT"
+      "x-ms-request-id" : "5079ffda-a01a-0005-697a-59e2e0000000",
+      "x-ms-client-request-id" : "73650229-c70b-4bd1-904b-1b2e1755e33a",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "38194ebd-7eed-45ad-833e-e4f92e33f1c4"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "c4d180e3-c938-4122-9d72-5bc8fd193601"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
       "x-ms-file-id" : "13835128424026341376",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.5771936Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3536977Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.5771936Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3536977Z",
       "x-ms-file-parent-id" : "0",
-      "eTag" : "0x8D910031E1C95A0",
-      "x-ms-request-id" : "259141d8-201a-0061-32eb-41e9f2000000",
-      "x-ms-client-request-id" : "38194ebd-7eed-45ad-833e-e4f92e33f1c4",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.5771936Z"
+      "eTag" : "0x8D92791D138CA51",
+      "x-ms-request-id" : "f92279b1-701a-002e-147a-59103a000000",
+      "x-ms-client-request-id" : "c4d180e3-c938-4122-9d72-5bc8fd193601",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3536977Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b20?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6850?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "21f5ff77-964d-4a31-9b3d-a2182cdc64d3"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9c45675d-7254-4050-8049-9447898cbf29"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
       "x-ms-file-id" : "13835093239654252544",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.6692586Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4546394Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.6692586Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4546394Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031E2AA1EA",
-      "x-ms-request-id" : "edeb58bc-d01a-0038-54eb-416e71000000",
-      "x-ms-client-request-id" : "21f5ff77-964d-4a31-9b3d-a2182cdc64d3",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.6692586Z"
+      "eTag" : "0x8D92791D148315A",
+      "x-ms-request-id" : "38a93630-d01a-002c-047a-592fd5000000",
+      "x-ms-client-request-id" : "9c45675d-7254-4050-8049-9447898cbf29",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4546394Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b20%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b23",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6850%2F0bc0533f0bc0533f45722974194ca2ef6da741d6853",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "769887df-49b9-44a2-a3a6-260646c8786b"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e3090423-4e0f-41d5-b906-e49873bdc006"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
       "x-ms-file-id" : "13835163608398430208",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.7533184Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5765696Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.7533184Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5765696Z",
       "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031E377580",
-      "x-ms-request-id" : "5fe79b1c-001a-0066-55eb-418591000000",
-      "x-ms-client-request-id" : "769887df-49b9-44a2-a3a6-260646c8786b",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.7533184Z"
+      "eTag" : "0x8D92791D15ACC40",
+      "x-ms-request-id" : "d121b8d4-401a-0021-457a-59bb8d000000",
+      "x-ms-client-request-id" : "e3090423-4e0f-41d5-b906-e49873bdc006",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5765696Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b20%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b24",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6850%2F0bc0533f0bc0533f45722974194ca2ef6da741d6854",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "9c7965d8-51b5-493d-9c30-41c69a11bf00"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "90b0598b-94f1-456b-aa2d-bf3f4491c878"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835075647468208128",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.8323748Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6994986Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.8323748Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6994986Z",
       "x-ms-file-parent-id" : "13835093239654252544",
-      "eTag" : "0x8D910031E4385A4",
-      "x-ms-request-id" : "6442f162-001a-0076-26eb-4140f9000000",
-      "x-ms-client-request-id" : "9c7965d8-51b5-493d-9c30-41c69a11bf00",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.8323748Z"
+      "eTag" : "0x8D92791D16D8E2A",
+      "x-ms-request-id" : "f92279bc-701a-002e-197a-59103a000000",
+      "x-ms-client-request-id" : "90b0598b-94f1-456b-aa2d-bf3f4491c878",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6994986Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b21?restype=directory",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6851?restype=directory",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "21df7269-9ada-479a-8cec-473741419e8f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f659669e-81ac-4980-90d1-708c78fb5d8a"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "3917056552249722909*6811422022089678740",
-      "x-ms-file-id" : "13835146016212385792",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:42.9134322Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7954433Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:41 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Directory",
-      "x-ms-file-change-time" : "2021-05-05T20:19:42.9134322Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7954433Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031E4FE3F2",
-      "x-ms-request-id" : "dfc614b1-c01a-0046-63eb-41fe36000000",
-      "x-ms-client-request-id" : "21df7269-9ada-479a-8cec-473741419e8f",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:42.9134322Z"
+      "eTag" : "0x8D92791D17C3201",
+      "x-ms-request-id" : "0c0bd3af-001a-0007-107a-59dd0f000000",
+      "x-ms-client-request-id" : "f659669e-81ac-4980-90d1-708c78fb5d8a",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7954433Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b21%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b25",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6851%2F0bc0533f0bc0533f45722974194ca2ef6da741d6855",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "ada949b5-19dc-40f6-ba95-982f47d9143f"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "327b13a4-dcfd-457e-8497-7671d977a0d8"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835110831840296960",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529250230440558592",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:43.0415228Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:43 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8913882Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:43.0415228Z",
-      "x-ms-file-parent-id" : "13835146016212385792",
-      "eTag" : "0x8D910031E636F7C",
-      "x-ms-request-id" : "67e7048c-901a-004b-33eb-4136e2000000",
-      "x-ms-client-request-id" : "ada949b5-19dc-40f6-ba95-982f47d9143f",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:43.0415228Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8913882Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D18AD5DA",
+      "x-ms-request-id" : "38a9363c-d01a-002c-0c7a-592fd5000000",
+      "x-ms-client-request-id" : "327b13a4-dcfd-457e-8497-7671d977a0d8",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8913882Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b21%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b26",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6851%2F0bc0533f0bc0533f45722974194ca2ef6da741d6856",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "fec80e51-5560-4aa6-98e0-83d67807f8f9"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ca6e458f-0c12-4d9a-80ca-6607cc39edb2"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835181200584474624",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:43.1846243Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:43 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0143175Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:43.1846243Z",
-      "x-ms-file-parent-id" : "13835146016212385792",
-      "eTag" : "0x8D910031E794563",
-      "x-ms-request-id" : "4685f246-901a-0016-72eb-413c66000000",
-      "x-ms-client-request-id" : "fec80e51-5560-4aa6-98e0-83d67807f8f9",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:43.1846243Z"
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0143175Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D19D97C7",
+      "x-ms-request-id" : "d9270195-d01a-0012-157a-59af7f000000",
+      "x-ms-client-request-id" : "ca6e458f-0c12-4d9a-80ca-6607cc39edb2",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0143175Z"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad%2F0bc0533f0bc0533f4ea88442e7579a09549f45b7b22",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9%2F0bc0533f0bc0533f45722974194ca2ef6da741d6852",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "11fd82af-93db-4d88-b52e-4561309e1cab"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6d1f0caa-748c-418d-a485-45c4675451c3"
     },
     "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "x-ms-file-permission-key" : "17737392480967489306*6811422022089678740",
-      "x-ms-file-id" : "13835066851375185920",
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "16140971433240035328",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-file-creation-time" : "2021-05-05T20:19:43.2626797Z",
-      "Last-Modified" : "Wed, 05 May 2021 20:19:43 GMT",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.1052654Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
       "retry-after" : "0",
       "StatusCode" : "201",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "x-ms-file-attributes" : "Archive",
-      "x-ms-file-change-time" : "2021-05-05T20:19:43.2626797Z",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.1052654Z",
       "x-ms-file-parent-id" : "13835128424026341376",
-      "eTag" : "0x8D910031E852E6D",
-      "x-ms-request-id" : "f2c5a75d-601a-004f-5beb-41bbe5000000",
-      "x-ms-client-request-id" : "11fd82af-93db-4d88-b52e-4561309e1cab",
-      "x-ms-file-last-write-time" : "2021-05-05T20:19:43.2626797Z"
+      "eTag" : "0x8D92791D1AB786E",
+      "x-ms-request-id" : "f92279c4-701a-002e-1e7a-59103a000000",
+      "x-ms-client-request-id" : "6d1f0caa-748c-418d-a485-45c4675451c3",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.1052654Z"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf/0bc0533f0bc0533f4ea684886e542d27852f4343ad?restype=directory&comp=list&prefix=0bc0533fnoOp&maxresults=3",
+    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f457938379b699a9bd02f4ecfb1/0bc0533f0bc0533f45737623425cb4ce42f842a7a9?restype=directory&comp=list&prefix=0bc0533fnoOp&maxresults=3",
     "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "e1a11134-3e9f-4593-b793-ad5c3713b62e"
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d5d89f70-befa-4827-b21b-b46e0b9dd2a1"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
+      "x-ms-version" : "2020-10-02",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "d97a4b2d-801a-0078-5deb-416949000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\" ShareName=\"0bc0533f0bc0533f4ea72257916a543c66ff4570bf\" DirectoryPath=\"0bc0533f0bc0533f4ea684886e542d27852f4343ad\"><Prefix>0bc0533fnoOp</Prefix><MaxResults>3</MaxResults><Entries /><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "e1a11134-3e9f-4593-b793-ad5c3713b62e",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT",
+      "x-ms-request-id" : "d121b8e6-401a-0021-537a-59bb8d000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"0bc0533f0bc0533f457938379b699a9bd02f4ecfb1\" DirectoryPath=\"0bc0533f0bc0533f45737623425cb4ce42f842a7a9\"><Prefix>0bc0533fnoOp</Prefix><MaxResults>3</MaxResults><DirectoryId>13835128424026341376</DirectoryId><Entries /><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "d5d89f70-befa-4827-b21b-b46e0b9dd2a1",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=0bc0533f&include=",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "40ccc7c1-8e01-4676-afc4-daf55b4b9195"
-    },
-    "Response" : {
-      "Transfer-Encoding" : "chunked",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "0eb6bd45-c01a-0024-7aeb-413c11000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://kasobolcanadacentral.file.core.windows.net/\"><Prefix>0bc0533f</Prefix><Shares><Share><Name>0bc0533f0bc0533f4ea72257916a543c66ff4570bf</Name><Properties><Last-Modified>Wed, 05 May 2021 20:19:42 GMT</Last-Modified><Etag>\"0x8D910031E043AAE\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><Quota>5120</Quota><AccessTier>TransactionOptimized</AccessTier><AccessTierChangeTime>Wed, 05 May 2021 20:19:42 GMT</AccessTierChangeTime><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride></Properties></Share></Shares><NextMarker /></EnumerationResults>",
-      "x-ms-client-request-id" : "40ccc7c1-8e01-4676-afc4-daf55b4b9195",
-      "Date" : "Wed, 05 May 2021 20:19:43 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "DELETE",
-    "Uri" : "https://REDACTED.file.core.windows.net/0bc0533f0bc0533f4ea72257916a543c66ff4570bf?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2020-06-12",
-      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "cb81d1bb-f07c-47c8-bdbe-094e38a5e608"
-    },
-    "Response" : {
-      "content-length" : "0",
-      "x-ms-version" : "2020-06-12",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "StatusCode" : "202",
-      "x-ms-request-id" : "6442f16c-001a-0076-2beb-4140f9000000",
-      "x-ms-client-request-id" : "cb81d1bb-f07c-47c8-bdbe-094e38a5e608",
-      "Date" : "Wed, 05 May 2021 20:19:42 GMT"
-    },
-    "Exception" : null
   } ],
-  "variables" : [ "0bc0533f0bc0533f4ea72257916a543c66ff4570bf", "0bc0533f0bc0533f4ea684886e542d27852f4343ad", "0bc0533f0bc0533f4ea88442e7579a09549f45b7b2" ]
+  "variables" : [ "0bc0533f0bc0533f457938379b699a9bd02f4ecfb1", "0bc0533f0bc0533f45737623425cb4ce42f842a7a9", "0bc0533f0bc0533f45722974194ca2ef6da741d685" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[3].json
new file mode 100644
index 000000000000..7f4033ac3464
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[3].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a1a55c8d-7768-4917-b3a5-4a109fde572e"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D104E67A",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "34fa9492-c01a-0030-517a-59b723000000",
+      "x-ms-client-request-id" : "a1a55c8d-7768-4917-b3a5-4a109fde572e",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f35900e1-364b-4a7f-8405-90d2f0f23837"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3007283Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3007283Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D130B533",
+      "x-ms-request-id" : "d121b8c6-401a-0021-3a7a-59bb8d000000",
+      "x-ms-client-request-id" : "f35900e1-364b-4a7f-8405-90d2f0f23837",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3007283Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba70?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "29f237c4-c60d-4d00-b7f8-3072a09cf7d2"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4436461Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4436461Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D14683ED",
+      "x-ms-request-id" : "5079ffe2-a01a-0005-6c7a-59e2e0000000",
+      "x-ms-client-request-id" : "29f237c4-c60d-4d00-b7f8-3072a09cf7d2",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4436461Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba70%2F12db627e12db627ef2c76805384b22244e5c4d9ba73",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8541a986-3f80-412e-a7e9-76aae9113ee3"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5455874Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5455874Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D1561202",
+      "x-ms-request-id" : "38a93633-d01a-002c-067a-592fd5000000",
+      "x-ms-client-request-id" : "8541a986-3f80-412e-a7e9-76aae9113ee3",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5455874Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba70%2F12db627e12db627ef2c76805384b22244e5c4d9ba74",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "568f3520-f1ee-4fdf-9b18-582979782b0c"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6655180Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6655180Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D1685ECC",
+      "x-ms-request-id" : "d121b8d7-401a-0021-477a-59bb8d000000",
+      "x-ms-client-request-id" : "568f3520-f1ee-4fdf-9b18-582979782b0c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6655180Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba71?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "87ee59ec-e259-40be-abfa-1add0dbbb5c0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7824507Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7824507Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D17A367B",
+      "x-ms-request-id" : "f92279bd-701a-002e-1a7a-59103a000000",
+      "x-ms-client-request-id" : "87ee59ec-e259-40be-abfa-1add0dbbb5c0",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7824507Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba71%2F12db627e12db627ef2c76805384b22244e5c4d9ba75",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "641bfbaf-bdb9-42db-832e-e57df8b4c1cb"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8803945Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8803945Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D1892869",
+      "x-ms-request-id" : "0c0bd3b1-001a-0007-117a-59dd0f000000",
+      "x-ms-client-request-id" : "641bfbaf-bdb9-42db-832e-e57df8b4c1cb",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8803945Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba71%2F12db627e12db627ef2c76805384b22244e5c4d9ba76",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b58bcb40-6938-44db-9a53-ec39be584984"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9803374Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9803374Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D198686E",
+      "x-ms-request-id" : "38a9363e-d01a-002c-0e7a-592fd5000000",
+      "x-ms-client-request-id" : "b58bcb40-6938-44db-9a53-ec39be584984",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9803374Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad%2F12db627e12db627ef2c76805384b22244e5c4d9ba72",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "06402611-bfe6-4c80-b6fa-89be1d0dbfa4"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835110831840296960",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0762817Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0762817Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1A70C41",
+      "x-ms-request-id" : "266798ac-501a-0003-5f7a-59a3d1000000",
+      "x-ms-client-request-id" : "06402611-bfe6-4c80-b6fa-89be1d0dbfa4",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0762817Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/12db627e12db627ef2c10015b5f027b9b8964b6fac/12db627e12db627ef2c71601b8f3a791ab2f4ac3ad?restype=directory&comp=list&prefix=12db627e&include=Timestamps",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "faef36dd-9040-4dcf-bc1b-55a395885651"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "38a93640-d01a-002c-107a-592fd5000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"12db627e12db627ef2c10015b5f027b9b8964b6fac\" DirectoryPath=\"12db627e12db627ef2c71601b8f3a791ab2f4ac3ad\"><Prefix>12db627e</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>12db627e12db627ef2c76805384b22244e5c4d9ba70</Name><FileId>13835093239654252544</FileId><Properties><CreationTime>2021-06-04T19:49:08.4436461Z</CreationTime><LastAccessTime>2021-06-04T19:49:08.4436461Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:08.4436461Z</LastWriteTime><ChangeTime>2021-06-04T19:49:08.4436461Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:08 GMT</Last-Modified></Properties></Directory><Directory><Name>12db627e12db627ef2c76805384b22244e5c4d9ba71</Name><FileId>13835075647468208128</FileId><Properties><CreationTime>2021-06-04T19:49:08.7824507Z</CreationTime><LastAccessTime>2021-06-04T19:49:08.7824507Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:08.7824507Z</LastWriteTime><ChangeTime>2021-06-04T19:49:08.7824507Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:08 GMT</Last-Modified></Properties></Directory><File><Name>12db627e12db627ef2c76805384b22244e5c4d9ba72</Name><FileId>13835110831840296960</FileId><Properties><Content-Length>1024</Content-Length><CreationTime>2021-06-04T19:49:09.0762817Z</CreationTime><LastAccessTime>2021-06-04T19:49:09.0762817Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:09.0762817Z</LastWriteTime><ChangeTime>2021-06-04T19:49:09.0762817Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:09 GMT</Last-Modified></Properties></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "faef36dd-9040-4dcf-bc1b-55a395885651",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "12db627e12db627ef2c10015b5f027b9b8964b6fac", "12db627e12db627ef2c71601b8f3a791ab2f4ac3ad", "12db627e12db627ef2c76805384b22244e5c4d9ba7" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[4].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[4].json
new file mode 100644
index 000000000000..b72998b53c5c
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[4].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6ff9a01b-2c75-434a-86d1-002aa84e2444"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D106460B",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "f92279ac-701a-002e-127a-59103a000000",
+      "x-ms-client-request-id" : "6ff9a01b-2c75-434a-86d1-002aa84e2444",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "35fcc965-cd71-4453-a43d-3040f9b16b66"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.2697460Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.2697460Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D12BFAF4",
+      "x-ms-request-id" : "f92279af-701a-002e-137a-59103a000000",
+      "x-ms-client-request-id" : "35fcc965-cd71-4453-a43d-3040f9b16b66",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.2697460Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d0?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "758e99ce-63d9-4596-b7ac-30f4cb1569ac"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3936753Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3936753Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D13EE3F1",
+      "x-ms-request-id" : "d121b8c8-401a-0021-3b7a-59bb8d000000",
+      "x-ms-client-request-id" : "758e99ce-63d9-4596-b7ac-30f4cb1569ac",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3936753Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d0%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5dbd3f04-ec60-4054-9215-cbb18512e6c1"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5275976Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5275976Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D1535348",
+      "x-ms-request-id" : "5079ffe4-a01a-0005-6d7a-59e2e0000000",
+      "x-ms-client-request-id" : "5dbd3f04-ec60-4054-9215-cbb18512e6c1",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5275976Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d0%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d4",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5d382cfb-15f2-4995-9ee7-5a4007638baf"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6425316Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6425316Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D164DCE4",
+      "x-ms-request-id" : "266798a5-501a-0003-5a7a-59a3d1000000",
+      "x-ms-client-request-id" : "5d382cfb-15f2-4995-9ee7-5a4007638baf",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6425316Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d1?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3cbbe221-4a41-4107-8ba3-472b9fa39747"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7914462Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7914462Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D17B95DE",
+      "x-ms-request-id" : "c6d2de8b-501a-001c-267a-59e384000000",
+      "x-ms-client-request-id" : "3cbbe221-4a41-4107-8ba3-472b9fa39747",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7914462Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d1%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d5",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b3a5b528-045f-44a9-95de-1fff8e4b4b14"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8823935Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8823935Z",
+      "x-ms-file-parent-id" : "13835146016212385792",
+      "eTag" : "0x8D92791D189767F",
+      "x-ms-request-id" : "5079ffeb-a01a-0005-717a-59e2e0000000",
+      "x-ms-client-request-id" : "b3a5b528-045f-44a9-95de-1fff8e4b4b14",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8823935Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d1%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d6",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6aa429ae-7f78-47a2-a349-fb556a504d45"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529232638254514176",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9913313Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9913313Z",
+      "x-ms-file-parent-id" : "13835146016212385792",
+      "eTag" : "0x8D92791D19A15E1",
+      "x-ms-request-id" : "266798ab-501a-0003-5e7a-59a3d1000000",
+      "x-ms-client-request-id" : "6aa429ae-7f78-47a2-a349-fb556a504d45",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9913313Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80%2F5d9af4b95d9af4b9ac5219256cd40d273d0244c88d2",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0623d21e-4c60-4eaa-bffa-d3d518917f9c"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835110831840296960",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0962706Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0962706Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1AA1912",
+      "x-ms-request-id" : "d9270198-d01a-0012-167a-59af7f000000",
+      "x-ms-client-request-id" : "0623d21e-4c60-4eaa-bffa-d3d518917f9c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0962706Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687/5d9af4b95d9af4b9ac520618918f2f64b43443db80?restype=directory&comp=list&prefix=5d9af4b9&include=Etag",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "71ca7962-d390-433c-ad6c-8728020b9324"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "f92279c5-701a-002e-1f7a-59103a000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687\" DirectoryPath=\"5d9af4b95d9af4b9ac520618918f2f64b43443db80\"><Prefix>5d9af4b9</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>5d9af4b95d9af4b9ac5219256cd40d273d0244c88d0</Name><FileId>13835093239654252544</FileId><Properties><Etag>\"0x8D92791D13EE3F1\"</Etag></Properties></Directory><Directory><Name>5d9af4b95d9af4b9ac5219256cd40d273d0244c88d1</Name><FileId>13835146016212385792</FileId><Properties><Etag>\"0x8D92791D17B95DE\"</Etag></Properties></Directory><File><Name>5d9af4b95d9af4b9ac5219256cd40d273d0244c88d2</Name><FileId>13835110831840296960</FileId><Properties><Content-Length>1024</Content-Length><Etag>\"0x8D92791D1AA1912\"</Etag></Properties></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "71ca7962-d390-433c-ad6c-8728020b9324",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "5d9af4b95d9af4b9ac5665916caf91b1a8dc4b3687", "5d9af4b95d9af4b9ac520618918f2f64b43443db80", "5d9af4b95d9af4b9ac5219256cd40d273d0244c88d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[5].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[5].json
new file mode 100644
index 000000000000..b3e4613c8a9b
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[5].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e4a47c8b-6b80-4add-b19f-67b6b986b1af"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D10660E1",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "2667989b-501a-0003-557a-59a3d1000000",
+      "x-ms-client-request-id" : "e4a47c8b-6b80-4add-b19f-67b6b986b1af",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "168f76bf-e238-4f1b-b8fe-d5559ead4f82"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.2697460Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.2697460Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D12BFAF4",
+      "x-ms-request-id" : "5079ffdd-a01a-0005-6a7a-59e2e0000000",
+      "x-ms-client-request-id" : "168f76bf-e238-4f1b-b8fe-d5559ead4f82",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.2697460Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8940?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6de6dd04-3dcc-44c9-9308-813c683f6fab"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3676898Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3676898Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D13AECE2",
+      "x-ms-request-id" : "38a9362e-d01a-002c-037a-592fd5000000",
+      "x-ms-client-request-id" : "6de6dd04-3dcc-44c9-9308-813c683f6fab",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3676898Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8940%2F4481c5f84481c5f871692822fdda897e8b4e49e8943",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0ac5bf91-d116-4d72-8def-1dc6ba9268ad"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5146050Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5146050Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D15157C2",
+      "x-ms-request-id" : "c6d2de79-501a-001c-177a-59e384000000",
+      "x-ms-client-request-id" : "0ac5bf91-d116-4d72-8def-1dc6ba9268ad",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5146050Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8940%2F4481c5f84481c5f871692822fdda897e8b4e49e8944",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a5c6559b-7a73-47c2-82fd-fa55a95bb8a3"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6325372Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6325372Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D163567C",
+      "x-ms-request-id" : "0c0bd3ab-001a-0007-0d7a-59dd0f000000",
+      "x-ms-client-request-id" : "a5c6559b-7a73-47c2-82fd-fa55a95bb8a3",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6325372Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8941?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4fd8b5f6-8c08-4d2e-bce6-74cfc654fd34"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "11529250230440558592",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7214861Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7214861Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D170E90D",
+      "x-ms-request-id" : "38a93639-d01a-002c-0a7a-592fd5000000",
+      "x-ms-client-request-id" : "4fd8b5f6-8c08-4d2e-bce6-74cfc654fd34",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7214861Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8941%2F4481c5f84481c5f871692822fdda897e8b4e49e8945",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "05950aa6-b592-47c2-9507-1fe96dee4f0c"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8484131Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8484131Z",
+      "x-ms-file-parent-id" : "11529250230440558592",
+      "eTag" : "0x8D92791D1844723",
+      "x-ms-request-id" : "d121b8dc-401a-0021-4b7a-59bb8d000000",
+      "x-ms-client-request-id" : "05950aa6-b592-47c2-9507-1fe96dee4f0c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8484131Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8941%2F4481c5f84481c5f871692822fdda897e8b4e49e8946",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a008a23f-f6a1-47a9-8897-eb2cc8c76276"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9683439Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9683439Z",
+      "x-ms-file-parent-id" : "11529250230440558592",
+      "eTag" : "0x8D92791D19693EF",
+      "x-ms-request-id" : "c6d2de95-501a-001c-2e7a-59e384000000",
+      "x-ms-client-request-id" : "a008a23f-f6a1-47a9-8897-eb2cc8c76276",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9683439Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589%2F4481c5f84481c5f871692822fdda897e8b4e49e8942",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "32f05f6c-a283-47fb-ad76-80331db2e200"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0542946Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0542946Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1A3B162",
+      "x-ms-request-id" : "5079ffed-a01a-0005-737a-59e2e0000000",
+      "x-ms-client-request-id" : "32f05f6c-a283-47fb-ad76-80331db2e200",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0542946Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/4481c5f84481c5f871623113a679fc43063c45198d/4481c5f84481c5f8716939698d4bd3ab1e7e499589?restype=directory&comp=list&prefix=4481c5f8&include=Attributes",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6a4bc071-cf6c-4d5a-884e-0609373557f7"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "0c0bd3b8-001a-0007-157a-59dd0f000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"4481c5f84481c5f871623113a679fc43063c45198d\" DirectoryPath=\"4481c5f84481c5f8716939698d4bd3ab1e7e499589\"><Prefix>4481c5f8</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>4481c5f84481c5f871692822fdda897e8b4e49e8940</Name><FileId>13835093239654252544</FileId><Properties /><Attributes>Directory</Attributes></Directory><Directory><Name>4481c5f84481c5f871692822fdda897e8b4e49e8941</Name><FileId>11529250230440558592</FileId><Properties /><Attributes>Directory</Attributes></Directory><File><Name>4481c5f84481c5f871692822fdda897e8b4e49e8942</Name><FileId>11529285414812647424</FileId><Properties><Content-Length>1024</Content-Length></Properties><Attributes>Archive</Attributes></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "6a4bc071-cf6c-4d5a-884e-0609373557f7",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "4481c5f84481c5f871623113a679fc43063c45198d", "4481c5f84481c5f8716939698d4bd3ab1e7e499589", "4481c5f84481c5f871692822fdda897e8b4e49e894" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[6].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[6].json
new file mode 100644
index 000000000000..d1c0e56acebc
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[6].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "45a0e502-1f7e-49a2-8b38-819a9106a383"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D1052A17",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "d9270192-d01a-0012-147a-59af7f000000",
+      "x-ms-client-request-id" : "45a0e502-1f7e-49a2-8b38-819a9106a383",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d059c2d8-cc25-47c7-a3e9-8b8ac2b8778f"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.2697460Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.2697460Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D12BFAF4",
+      "x-ms-request-id" : "0c0bd3a4-001a-0007-097a-59dd0f000000",
+      "x-ms-client-request-id" : "d059c2d8-cc25-47c7-a3e9-8b8ac2b8778f",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.2697460Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e0?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9a0935a1-68b6-498b-9999-8f609e4a7caa"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4386490Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4386490Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D145C0BA",
+      "x-ms-request-id" : "f92279b3-701a-002e-157a-59103a000000",
+      "x-ms-client-request-id" : "9a0935a1-68b6-498b-9999-8f609e4a7caa",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4386490Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e0%2F6fac963b6fac963b38109349720adf5eb37842348e3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5d1ff555-eabc-45f8-b42b-700ebb50c2ee"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5315952Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5315952Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D153EF70",
+      "x-ms-request-id" : "0c0bd3aa-001a-0007-0c7a-59dd0f000000",
+      "x-ms-client-request-id" : "5d1ff555-eabc-45f8-b42b-700ebb50c2ee",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5315952Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e0%2F6fac963b6fac963b38109349720adf5eb37842348e4",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "78e0c76e-3576-48ff-9a9b-e065705b4346"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6315378Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6315378Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D1632F72",
+      "x-ms-request-id" : "38a93637-d01a-002c-097a-592fd5000000",
+      "x-ms-client-request-id" : "78e0c76e-3576-48ff-9a9b-e065705b4346",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6315378Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e1?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "75937653-269a-46ad-9af5-1ef121c041aa"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7564657Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7564657Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1763F71",
+      "x-ms-request-id" : "d121b8d9-401a-0021-497a-59bb8d000000",
+      "x-ms-client-request-id" : "75937653-269a-46ad-9af5-1ef121c041aa",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7564657Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e1%2F6fac963b6fac963b38109349720adf5eb37842348e5",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "23453cbc-962f-4b93-a51d-de2b752fb07a"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8833935Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8833935Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D1899D8F",
+      "x-ms-request-id" : "c6d2de90-501a-001c-2a7a-59e384000000",
+      "x-ms-client-request-id" : "23453cbc-962f-4b93-a51d-de2b752fb07a",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8833935Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e1%2F6fac963b6fac963b38109349720adf5eb37842348e6",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "9dbce625-7d7c-4c8e-a783-768e71cf89c2"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "16140971433240035328",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9713423Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9713423Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D197090F",
+      "x-ms-request-id" : "0c0bd3b3-001a-0007-127a-59dd0f000000",
+      "x-ms-client-request-id" : "9dbce625-7d7c-4c8e-a783-768e71cf89c2",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9713423Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885%2F6fac963b6fac963b38109349720adf5eb37842348e2",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "720781c1-723f-418d-86b0-82f0fc5ddaf0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0612904Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0612904Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1A4C2A8",
+      "x-ms-request-id" : "38a9363f-d01a-002c-0f7a-592fd5000000",
+      "x-ms-client-request-id" : "720781c1-723f-418d-86b0-82f0fc5ddaf0",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0612904Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/6fac963b6fac963b3813534446d4e4d29b284cc2af/6fac963b6fac963b381660836d5f4bd68ea14cf885?restype=directory&comp=list&prefix=6fac963b&include=PermissionKey",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "87ad7d29-16f5-4266-aba3-3c45f2702186"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "266798ae-501a-0003-607a-59a3d1000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"6fac963b6fac963b3813534446d4e4d29b284cc2af\" DirectoryPath=\"6fac963b6fac963b381660836d5f4bd68ea14cf885\"><Prefix>6fac963b</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>6fac963b6fac963b38109349720adf5eb37842348e0</Name><FileId>13835093239654252544</FileId><Properties /><PermissionKey>2663978480635205383*5486365400479318158</PermissionKey></Directory><Directory><Name>6fac963b6fac963b38109349720adf5eb37842348e1</Name><FileId>13835075647468208128</FileId><Properties /><PermissionKey>2663978480635205383*5486365400479318158</PermissionKey></Directory><File><Name>6fac963b6fac963b38109349720adf5eb37842348e2</Name><FileId>11529320599184736256</FileId><Properties><Content-Length>1024</Content-Length></Properties><PermissionKey>16466167399171598336*5486365400479318158</PermissionKey></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "87ad7d29-16f5-4266-aba3-3c45f2702186",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "6fac963b6fac963b3813534446d4e4d29b284cc2af", "6fac963b6fac963b381660836d5f4bd68ea14cf885", "6fac963b6fac963b38109349720adf5eb37842348e" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[7].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[7].json
new file mode 100644
index 000000000000..91748990b1c4
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[7].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b174c91b-e7f7-4e5f-bd33-51d8a4c51307"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D106202C",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "38a9362a-d01a-002c-017a-592fd5000000",
+      "x-ms-client-request-id" : "b174c91b-e7f7-4e5f-bd33-51d8a4c51307",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d65db226-72c2-4729-9a9a-83a68298ebce"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.2697460Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.2697460Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D12BFAF4",
+      "x-ms-request-id" : "38a9362d-d01a-002c-027a-592fd5000000",
+      "x-ms-client-request-id" : "d65db226-72c2-4729-9a9a-83a68298ebce",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.2697460Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af0?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3fd0c367-8d8f-4dea-9f98-01c57f90c664"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4446454Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4446454Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D146AAF6",
+      "x-ms-request-id" : "0c0bd3a8-001a-0007-0b7a-59dd0f000000",
+      "x-ms-client-request-id" : "3fd0c367-8d8f-4dea-9f98-01c57f90c664",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4446454Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af0%2F76b7a77a76b7a77a340435051c36eed38be54fa3af3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a449acc4-f86f-40ed-8733-cabf15b69b7e"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.5545819Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.5545819Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D157715B",
+      "x-ms-request-id" : "266798a3-501a-0003-597a-59a3d1000000",
+      "x-ms-client-request-id" : "a449acc4-f86f-40ed-8733-cabf15b69b7e",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.5545819Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af0%2F76b7a77a76b7a77a340435051c36eed38be54fa3af4",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0abd71f9-2563-4f45-aeae-c7b63d9b30b5"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6994986Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6994986Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D16D8E2A",
+      "x-ms-request-id" : "c6d2de83-501a-001c-1f7a-59e384000000",
+      "x-ms-client-request-id" : "0abd71f9-2563-4f45-aeae-c7b63d9b30b5",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6994986Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af1?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "23afe36a-0963-4940-91e2-c50a5d62171c"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8034389Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8034389Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D17D6A55",
+      "x-ms-request-id" : "5079ffe9-a01a-0005-707a-59e2e0000000",
+      "x-ms-client-request-id" : "23afe36a-0963-4940-91e2-c50a5d62171c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8034389Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af1%2F76b7a77a76b7a77a340435051c36eed38be54fa3af5",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3de37073-0bdc-4151-921c-9154ab31c2d0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9073793Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9073793Z",
+      "x-ms-file-parent-id" : "13835146016212385792",
+      "eTag" : "0x8D92791D18D4681",
+      "x-ms-request-id" : "266798aa-501a-0003-5d7a-59a3d1000000",
+      "x-ms-client-request-id" : "3de37073-0bdc-4151-921c-9154ab31c2d0",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9073793Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af1%2F76b7a77a76b7a77a340435051c36eed38be54fa3af6",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e1da20d2-e478-44a2-aea0-7e6d213ebc44"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835110831840296960",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0223128Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0223128Z",
+      "x-ms-file-parent-id" : "13835146016212385792",
+      "eTag" : "0x8D92791D19ED018",
+      "x-ms-request-id" : "f92279c2-701a-002e-1d7a-59103a000000",
+      "x-ms-client-request-id" : "e1da20d2-e478-44a2-aea0-7e6d213ebc44",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0223128Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab%2F76b7a77a76b7a77a340435051c36eed38be54fa3af2",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "ac76f29f-be7b-4dcb-bfb4-7cf50886ecad"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835181200584474624",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.1192571Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.1192571Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1AD9AFB",
+      "x-ms-request-id" : "d121b8e3-401a-0021-517a-59bb8d000000",
+      "x-ms-client-request-id" : "ac76f29f-be7b-4dcb-bfb4-7cf50886ecad",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.1192571Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/76b7a77a76b7a77a3400827473ad901866334cc19f/76b7a77a76b7a77a340480422849c2f9538a4e2aab?restype=directory&comp=list&prefix=76b7a77a&include=Attributes%2CEtag%2CTimestamps%2CPermissionKey",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e3079cba-114b-42fd-a74e-382de5b8f166"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "c6d2de9d-501a-001c-357a-59e384000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"76b7a77a76b7a77a3400827473ad901866334cc19f\" DirectoryPath=\"76b7a77a76b7a77a340480422849c2f9538a4e2aab\"><Prefix>76b7a77a</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>76b7a77a76b7a77a340435051c36eed38be54fa3af0</Name><FileId>13835093239654252544</FileId><Properties><CreationTime>2021-06-04T19:49:08.4446454Z</CreationTime><LastAccessTime>2021-06-04T19:49:08.4446454Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:08.4446454Z</LastWriteTime><ChangeTime>2021-06-04T19:49:08.4446454Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:08 GMT</Last-Modified><Etag>\"0x8D92791D146AAF6\"</Etag></Properties><Attributes>Directory</Attributes><PermissionKey>2663978480635205383*5486365400479318158</PermissionKey></Directory><Directory><Name>76b7a77a76b7a77a340435051c36eed38be54fa3af1</Name><FileId>13835146016212385792</FileId><Properties><CreationTime>2021-06-04T19:49:08.8034389Z</CreationTime><LastAccessTime>2021-06-04T19:49:08.8034389Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:08.8034389Z</LastWriteTime><ChangeTime>2021-06-04T19:49:08.8034389Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:08 GMT</Last-Modified><Etag>\"0x8D92791D17D6A55\"</Etag></Properties><Attributes>Directory</Attributes><PermissionKey>2663978480635205383*5486365400479318158</PermissionKey></Directory><File><Name>76b7a77a76b7a77a340435051c36eed38be54fa3af2</Name><FileId>13835181200584474624</FileId><Properties><Content-Length>1024</Content-Length><CreationTime>2021-06-04T19:49:09.1192571Z</CreationTime><LastAccessTime>2021-06-04T19:49:09.1192571Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:09.1192571Z</LastWriteTime><ChangeTime>2021-06-04T19:49:09.1192571Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:09 GMT</Last-Modified><Etag>\"0x8D92791D1AD9AFB\"</Etag></Properties><Attributes>Archive</Attributes><PermissionKey>16466167399171598336*5486365400479318158</PermissionKey></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "e3079cba-114b-42fd-a74e-382de5b8f166",
+      "Date" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "76b7a77a76b7a77a3400827473ad901866334cc19f", "76b7a77a76b7a77a340480422849c2f9538a4e2aab", "76b7a77a76b7a77a340435051c36eed38be54fa3af" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[8].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[8].json
new file mode 100644
index 000000000000..0ee99635d55f
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesArgs[8].json
@@ -0,0 +1,278 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d8bcd933-4282-4933-9b01-5a287094a7fe"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791D10618F8",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "0c0bd3a1-001a-0007-087a-59dd0f000000",
+      "x-ms-client-request-id" : "d8bcd933-4282-4933-9b01-5a287094a7fe",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "38e53cbc-91a5-4170-bc5d-83daff9fc68c"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.3586950Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.3586950Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791D1398D86",
+      "x-ms-request-id" : "5079ffe0-a01a-0005-6b7a-59e2e0000000",
+      "x-ms-client-request-id" : "38e53cbc-91a5-4170-bc5d-83daff9fc68c",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.3586950Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c0?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "004010a6-ed34-4df5-a690-ec434a0cd8a0"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835093239654252544",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.4846226Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.4846226Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D14CC492",
+      "x-ms-request-id" : "d121b8ce-401a-0021-407a-59bb8d000000",
+      "x-ms-client-request-id" : "004010a6-ed34-4df5-a690-ec434a0cd8a0",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.4846226Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c0%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "df51a192-9400-43a5-af1c-7c2293932796"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835163608398430208",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.6135484Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.6135484Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D16070BC",
+      "x-ms-request-id" : "f92279ba-701a-002e-187a-59103a000000",
+      "x-ms-client-request-id" : "df51a192-9400-43a5-af1c-7c2293932796",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.6135484Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c0%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c4",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "72519a03-934f-46cd-b154-d20c3941d327"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.7214861Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:07 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.7214861Z",
+      "x-ms-file-parent-id" : "13835093239654252544",
+      "eTag" : "0x8D92791D170E90D",
+      "x-ms-request-id" : "5079ffe8-a01a-0005-6f7a-59e2e0000000",
+      "x-ms-client-request-id" : "72519a03-934f-46cd-b154-d20c3941d327",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.7214861Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c1?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f4250a5e-0581-45bc-ac5a-bfe59d28e2ab"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835075647468208128",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.8174307Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.8174307Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D17F8CE3",
+      "x-ms-request-id" : "266798a8-501a-0003-5c7a-59a3d1000000",
+      "x-ms-client-request-id" : "f4250a5e-0581-45bc-ac5a-bfe59d28e2ab",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.8174307Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c1%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c5",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e25a8269-db7a-4a84-9f03-a67182a801e6"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529320599184736256",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:08.9413596Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:08.9413596Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D19275DC",
+      "x-ms-request-id" : "f92279c0-701a-002e-1c7a-59103a000000",
+      "x-ms-client-request-id" : "e25a8269-db7a-4a84-9f03-a67182a801e6",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:08.9413596Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c1%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c6",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "1b4e9fce-4f66-4f61-b1eb-022dcbdd85cb"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529250230440558592",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.0283094Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.0283094Z",
+      "x-ms-file-parent-id" : "13835075647468208128",
+      "eTag" : "0x8D92791D19FBA56",
+      "x-ms-request-id" : "d121b8e2-401a-0021-507a-59bb8d000000",
+      "x-ms-client-request-id" : "1b4e9fce-4f66-4f61-b1eb-022dcbdd85cb",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.0283094Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796%2Ff12fbbb5f12fbbb53ef75678244f33ef25534d3b8c2",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3ba81ffa-aea8-4861-8d82-8393e5f00fc1"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "13835146016212385792",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:09.1362477Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:09 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:09.1362477Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791D1B032AD",
+      "x-ms-request-id" : "c6d2de9a-501a-001c-337a-59e384000000",
+      "x-ms-client-request-id" : "3ba81ffa-aea8-4861-8d82-8393e5f00fc1",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:09.1362477Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/f12fbbb5f12fbbb53ef243205f091b52527143fc91/f12fbbb5f12fbbb53ef502513300cb92e2f94e6796?restype=directory&comp=list&prefix=f12fbbb5",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6cb73b6f-e662-40e7-ad47-d4096483b1f4"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "5079fff0-a01a-0005-757a-59e2e0000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"f12fbbb5f12fbbb53ef243205f091b52527143fc91\" DirectoryPath=\"f12fbbb5f12fbbb53ef502513300cb92e2f94e6796\"><Prefix>f12fbbb5</Prefix><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>f12fbbb5f12fbbb53ef75678244f33ef25534d3b8c0</Name><FileId>13835093239654252544</FileId><Properties /></Directory><Directory><Name>f12fbbb5f12fbbb53ef75678244f33ef25534d3b8c1</Name><FileId>13835075647468208128</FileId><Properties /></Directory><File><Name>f12fbbb5f12fbbb53ef75678244f33ef25534d3b8c2</Name><FileId>13835146016212385792</FileId><Properties><Content-Length>1024</Content-Length></Properties></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "6cb73b6f-e662-40e7-ad47-d4096483b1f4",
+      "Date" : "Fri, 04 Jun 2021 19:49:08 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "f12fbbb5f12fbbb53ef243205f091b52527143fc91", "f12fbbb5f12fbbb53ef502513300cb92e2f94e6796", "f12fbbb5f12fbbb53ef75678244f33ef25534d3b8c" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesExtendedInfoResults.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesExtendedInfoResults.json
new file mode 100644
index 000000000000..9ad4e4ba5eeb
--- /dev/null
+++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/DirectoryAPITestsListFilesAndDirectoriesExtendedInfoResults.json
@@ -0,0 +1,133 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/d362b48fd362b48fc8c14593af6865c49ed74ccd9d?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8489ffc8-ff6d-4d30-b14d-6176494013ed"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D92791E1A00FDF",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:35 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "c6d2e1c5-501a-001c-2e7a-59e384000000",
+      "x-ms-client-request-id" : "8489ffc8-ff6d-4d30-b14d-6176494013ed",
+      "Date" : "Fri, 04 Jun 2021 19:49:35 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/d362b48fd362b48fc8c14593af6865c49ed74ccd9d/d362b48fd362b48fc8c5202909a43a98507b4cb09b?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b06e12f3-8c01-428d-816c-bc601d00c68e"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "13835128424026341376",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:36.1047273Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:36 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:35 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:36.1047273Z",
+      "x-ms-file-parent-id" : "0",
+      "eTag" : "0x8D92791E1C342E9",
+      "x-ms-request-id" : "c6d2e1d0-501a-001c-387a-59e384000000",
+      "x-ms-client-request-id" : "b06e12f3-8c01-428d-816c-bc601d00c68e",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:36.1047273Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/d362b48fd362b48fc8c14593af6865c49ed74ccd9d/d362b48fd362b48fc8c5202909a43a98507b4cb09b%2Fd362b48fd362b48fc8c39264d0d8715cca8c4b25b2",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "20cf125e-2af5-41b1-8f72-503b94ba2160"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "16466167399171598336*5486365400479318158",
+      "x-ms-file-id" : "11529285414812647424",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:36.2156635Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:36 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:35 GMT",
+      "x-ms-file-attributes" : "Archive",
+      "x-ms-file-change-time" : "2021-06-04T19:49:36.2156635Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791E1D4305B",
+      "x-ms-request-id" : "c6d2e1d6-501a-001c-3e7a-59e384000000",
+      "x-ms-client-request-id" : "20cf125e-2af5-41b1-8f72-503b94ba2160",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:36.2156635Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.file.core.windows.net/d362b48fd362b48fc8c14593af6865c49ed74ccd9d/d362b48fd362b48fc8c5202909a43a98507b4cb09b%2Fd362b48fd362b48fc8c20541c3e4690c478d47b88f?restype=directory",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "a69d43d4-4121-438d-820f-d3470ed54184"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "x-ms-file-permission-key" : "2663978480635205383*5486365400479318158",
+      "x-ms-file-id" : "16140971433240035328",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-file-creation-time" : "2021-06-04T19:49:36.3156059Z",
+      "Last-Modified" : "Fri, 04 Jun 2021 19:49:36 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 04 Jun 2021 19:49:35 GMT",
+      "x-ms-file-attributes" : "Directory",
+      "x-ms-file-change-time" : "2021-06-04T19:49:36.3156059Z",
+      "x-ms-file-parent-id" : "13835128424026341376",
+      "eTag" : "0x8D92791E1E3705B",
+      "x-ms-request-id" : "c6d2e1dc-501a-001c-447a-59e384000000",
+      "x-ms-client-request-id" : "a69d43d4-4121-438d-820f-d3470ed54184",
+      "x-ms-file-last-write-time" : "2021-06-04T19:49:36.3156059Z"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.file.core.windows.net/d362b48fd362b48fc8c14593af6865c49ed74ccd9d/d362b48fd362b48fc8c5202909a43a98507b4cb09b?restype=directory&comp=list&include=Attributes%2CEtag%2CTimestamps%2CPermissionKey",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "3773c99e-42b6-4913-bdf4-6cf7cec4ebdf"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "c6d2e1e3-501a-001c-4b7a-59e384000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanstageoauth.file.core.windows.net/\" ShareName=\"d362b48fd362b48fc8c14593af6865c49ed74ccd9d\" DirectoryPath=\"d362b48fd362b48fc8c5202909a43a98507b4cb09b\"><DirectoryId>13835128424026341376</DirectoryId><Entries><Directory><Name>d362b48fd362b48fc8c20541c3e4690c478d47b88f</Name><FileId>16140971433240035328</FileId><Properties><CreationTime>2021-06-04T19:49:36.3156059Z</CreationTime><LastAccessTime>2021-06-04T19:49:36.3156059Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:36.3156059Z</LastWriteTime><ChangeTime>2021-06-04T19:49:36.3156059Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:36 GMT</Last-Modified><Etag>\"0x8D92791E1E3705B\"</Etag></Properties><Attributes>Directory</Attributes><PermissionKey>2663978480635205383*5486365400479318158</PermissionKey></Directory><File><Name>d362b48fd362b48fc8c39264d0d8715cca8c4b25b2</Name><FileId>11529285414812647424</FileId><Properties><Content-Length>1024</Content-Length><CreationTime>2021-06-04T19:49:36.2156635Z</CreationTime><LastAccessTime>2021-06-04T19:49:36.2156635Z</LastAccessTime><LastWriteTime>2021-06-04T19:49:36.2156635Z</LastWriteTime><ChangeTime>2021-06-04T19:49:36.2156635Z</ChangeTime><Last-Modified>Fri, 04 Jun 2021 19:49:36 GMT</Last-Modified><Etag>\"0x8D92791E1D4305B\"</Etag></Properties><Attributes>Archive</Attributes><PermissionKey>16466167399171598336*5486365400479318158</PermissionKey></File></Entries><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "3773c99e-42b6-4913-bdf4-6cf7cec4ebdf",
+      "Date" : "Fri, 04 Jun 2021 19:49:35 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "d362b48fd362b48fc8c14593af6865c49ed74ccd9d", "d362b48fd362b48fc8c5202909a43a98507b4cb09b", "d362b48fd362b48fc8c39264d0d8715cca8c4b25b2", "d362b48fd362b48fc8c20541c3e4690c478d47b88f" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file-share/swagger/README.md b/sdk/storage/azure-storage-file-share/swagger/README.md
index 76d4497062d6..73fbc0541d01 100644
--- a/sdk/storage/azure-storage-file-share/swagger/README.md
+++ b/sdk/storage/azure-storage-file-share/swagger/README.md
@@ -16,7 +16,7 @@ autorest --java --use:@autorest/java@4.0.x
 
 ### Code generation settings
 ``` yaml
-input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.FileStorage/preview/2020-04-08/file.json
+input-file: https://raw.githubusercontent.com/seanmcc-msft/azure-rest-api-specs/feature/storage/listFilesV2/specification/storage/data-plane/Microsoft.FileStorage/preview/2020-10-02/file.json
 java: true
 output-folder: ../
 namespace: com.azure.storage.file.share
diff --git a/sdk/storage/azure-storage-file-share/swagger/pom.xml b/sdk/storage/azure-storage-file-share/swagger/pom.xml
index 35d132db2439..57ab653cfba8 100644
--- a/sdk/storage/azure-storage-file-share/swagger/pom.xml
+++ b/sdk/storage/azure-storage-file-share/swagger/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>com.azure.tools</groupId>
       <artifactId>azure-autorest-customization</artifactId>
-      <version>1.0.0-beta.2</version>
+      <version>1.0.0-beta.4</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java b/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java
index a3e34f108b4f..65cc8d7a5251 100644
--- a/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java
+++ b/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java
@@ -9,13 +9,14 @@
 import com.azure.autorest.customization.MethodCustomization;
 import com.azure.autorest.customization.PackageCustomization;
 import com.azure.autorest.customization.PropertyCustomization;
+import org.slf4j.Logger;
 
 /**
  * Customization class for File Share Storage.
  */
 public class ShareStorageCustomization extends Customization {
     @Override
-    public void customize(LibraryCustomization customization) {
+    public void customize(LibraryCustomization customization, Logger logger) {
         PackageCustomization implementation = customization.getPackage("com.azure.storage.file.share.implementation");
 
         ClassCustomization directoriesImpl = implementation.getClass("DirectoriesImpl");

From 2286afe0d4737f2cc6353553817c111780be95b0 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <61715331+kasobol-msft@users.noreply.github.com>
Date: Fri, 18 Jun 2021 11:04:35 -0700
Subject: [PATCH 6/9] Fix test.

---
 .../QueueSASTestsAccountSASCreateDeleteQueue.json           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
index 285006c09eb1..6a81d120fa0a 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueSASTestsAccountSASCreateDeleteQueue.json
@@ -1,7 +1,7 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd71971375275b773e1ce247a6b5?sv=2020-08-04&ss=q&srt=sco&se=2021-06-12T23%3A00%3A48Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd71971375275b773e1ce247a6b5?sv=2020-10-02&ss=q&srt=sco&se=2021-06-12T23%3A00%3A48Z&sp=rdc&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-queue/12.11.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -20,7 +20,7 @@
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd71971375275b773e1ce247a6b5?sv=2020-08-04&ss=q&srt=sco&se=2021-06-12T23%3A00%3A48Z&sp=rdc&sig=REDACTED",
+    "Uri" : "https://REDACTED.queue.core.windows.net/cf320dddcf320ddd71971375275b773e1ce247a6b5?sv=2020-10-02&ss=q&srt=sco&se=2021-06-12T23%3A00%3A48Z&sp=rdc&sig=REDACTED",
     "Headers" : {
       "x-ms-version" : "2020-08-04",
       "User-Agent" : "azsdk-java-azure-storage-queue/12.11.0-beta.1 (11.0.8; Windows 10; 10.0)",
@@ -39,4 +39,4 @@
     "Exception" : null
   } ],
   "variables" : [ "cf320dddcf320ddd719373645103c68a347749a394", "2021-06-11T23:00:48.051306Z", "cf320dddcf320ddd71971375275b773e1ce247a6b5" ]
-}
\ No newline at end of file
+}

From e79d228d87389bf7ea61338973b7bafe3d94a9b7 Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Fri, 18 Jun 2021 13:58:50 -0700
Subject: [PATCH 7/9] Implemented list deleted root blob with versions (#21996)

---
 sdk/storage/azure-storage-blob/CHANGELOG.md   |   1 +
 .../blob/implementation/util/ModelHelper.java |   2 +
 .../azure/storage/blob/models/BlobItem.java   |  26 ++++
 .../storage/blob/models/BlobListDetails.java  |  24 ++++
 .../storage/blob/ContainerAPITest.groovy      |  54 +++++++--
 ...stBlobsFlatOptionsDeletedWithVersions.json | 112 ++++++++++++++++++
 ...stBlobsHierOptionsDeletedWithVersions.json | 112 ++++++++++++++++++
 7 files changed, 324 insertions(+), 7 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json

diff --git a/sdk/storage/azure-storage-blob/CHANGELOG.md b/sdk/storage/azure-storage-blob/CHANGELOG.md
index 515a5db14bde..93f30a63b262 100644
--- a/sdk/storage/azure-storage-blob/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blob/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 12.13.0-beta.1 (Unreleased)
 - Added support to get a blob client that uses an encryption scope and customer provided key. 
 - Added support for the 2020-10-02 service version.
+- Added support to list blobs deleted with versioning enabled. 
 - Added support to specify Parquet Input Serialization when querying a blob.
 
 ## 12.12.0 (2021-06-09)
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
index 22c6f70adbf5..1516679aeba4 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
@@ -274,6 +274,8 @@ public static BlobItem populateBlobItem(BlobItemInternal blobItemInternal) {
         blobItem.setObjectReplicationSourcePolicies(
             transformObjectReplicationMetadata(blobItemInternal.getObjectReplicationMetadata()));
 
+        blobItem.setHasVersionsOnly(blobItemInternal.isHasVersionsOnly());
+
         return blobItem;
     }
 
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
index 8d7f452f3738..c3b02028d4c1 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobItem.java
@@ -70,6 +70,12 @@ public final class BlobItem {
     @JsonProperty(value = "IsPrefix")
     private Boolean isPrefix;
 
+    /*
+     * The HasVersionsOnly property.
+     */
+    @JsonProperty(value = "HasVersionsOnly")
+    private Boolean hasVersionsOnly;
+
     /**
      * Get the name property: The name property.
      *
@@ -253,6 +259,26 @@ public BlobItem setObjectReplicationSourcePolicies(List<ObjectReplicationPolicy>
         return this;
     }
 
+    /**
+     * Get the hasVersionsOnly property: The HasVersionsOnly property.
+     *
+     * @return the hasVersionsOnly value.
+     */
+    public Boolean hasVersionsOnly() {
+        return this.hasVersionsOnly;
+    }
+
+    /**
+     * Set the hasVersionsOnly property: The HasVersionsOnly property.
+     *
+     * @param hasVersionsOnly the hasVersionsOnly value to set.
+     * @return the BlobItemInternal object itself.
+     */
+    public BlobItem setHasVersionsOnly(Boolean hasVersionsOnly) {
+        this.hasVersionsOnly = hasVersionsOnly;
+        return this;
+    }
+
     /**
      * Get the isPrefix property: The isPrefix property.
      *
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
index 044dd4ac6e66..6a19f9c7c769 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobListDetails.java
@@ -23,6 +23,7 @@ public final class BlobListDetails {
     private boolean retrieveUncommittedBlobs;
     private boolean retrieveDeletedBlobs;
     private boolean retrieveVersions;
+    private boolean retrieveDeletedWithVersions;
     private boolean retrieveImmutabilityPolicy;
     private boolean retrieveLegalHold;
 
@@ -174,6 +175,26 @@ public BlobListDetails setRetrieveDeletedBlobs(boolean retrieveDeletedBlobs) {
         return this;
     }
 
+    /**
+     * Whether blobs which have been deleted with versioning.
+     *
+     * @return a flag indicating if deleted blobs with versioning will be returned in the listing
+     */
+    public boolean getRetrieveDeletedBlobsWithVersions() {
+        return retrieveDeletedWithVersions;
+    }
+
+    /**
+     * Whether blobs which have been deleted with versioning should be returned.
+     *
+     * @param retrieveDeletedWithVersions Flag indicating whether deleted blobs with versioning should be returned
+     * @return the updated BlobListDetails object
+     */
+    public BlobListDetails setRetrieveDeletedBlobsWithVersions(boolean retrieveDeletedWithVersions) {
+        this.retrieveDeletedWithVersions = retrieveDeletedWithVersions;
+        return this;
+    }
+
     /**
      * Whether immutability policy for the blob should be returned.
      *
@@ -240,6 +261,9 @@ public ArrayList<ListBlobsIncludeItem> toList() {
         if (this.retrieveVersions) {
             details.add(ListBlobsIncludeItem.VERSIONS);
         }
+        if (this.retrieveDeletedWithVersions) {
+            details.add(ListBlobsIncludeItem.DELETEDWITHVERSIONS);
+        }
         if (this.retrieveImmutabilityPolicy) {
             details.add(ListBlobsIncludeItem.IMMUTABILITYPOLICY);
         }
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy
index ebdcddea4d7d..bd09796bc6c3 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy
@@ -3,15 +3,13 @@
 
 package com.azure.storage.blob
 
-import com.azure.core.http.rest.PagedIterable
-import com.azure.core.http.rest.PagedResponse
+
 import com.azure.core.http.rest.Response
 import com.azure.identity.DefaultAzureCredentialBuilder
 import com.azure.storage.blob.models.AccessTier
 import com.azure.storage.blob.models.AppendBlobItem
 import com.azure.storage.blob.models.BlobAccessPolicy
 import com.azure.storage.blob.models.BlobErrorCode
-import com.azure.storage.blob.models.BlobItem
 import com.azure.storage.blob.models.BlobListDetails
 import com.azure.storage.blob.models.BlobProperties
 import com.azure.storage.blob.models.BlobRequestConditions
@@ -31,14 +29,10 @@ import com.azure.storage.blob.options.BlobSetAccessTierOptions
 import com.azure.storage.blob.options.PageBlobCreateOptions
 import com.azure.storage.blob.specialized.AppendBlobClient
 import com.azure.storage.blob.specialized.BlobClientBase
-import com.azure.storage.common.StorageSharedKeyCredential
 import com.azure.storage.common.Utility
-import com.azure.storage.common.implementation.StorageImplUtils
 import com.azure.storage.common.test.shared.extensions.PlaybackOnly
 import com.azure.storage.common.test.shared.extensions.RequiredServiceVersion
 import reactor.test.StepVerifier
-import spock.lang.Requires
-import spock.lang.ResourceLock
 import spock.lang.Unroll
 
 import java.time.Duration
@@ -921,6 +915,29 @@ class ContainerAPITest extends APISpec {
             .verifyComplete()
     }
 
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "list blobs flat options deleted with versions"() {
+        setup:
+        def blobName = generateBlobName()
+        def blob = cc.getBlobClient(blobName).getAppendBlobClient()
+        blob.create()
+        def metadata = new HashMap<String, String>()
+        metadata.put("foo", "bar")
+        blob.setMetadata(metadata)
+        blob.delete()
+        def options = new ListBlobsOptions().setPrefix(blobName)
+            .setDetails(new BlobListDetails().setRetrieveDeletedBlobsWithVersions(true))
+
+        when:
+        def blobs = cc.listBlobs(options, null).iterator()
+
+        then:
+        def b = blobs.next()
+        !blobs.hasNext()
+        b.getName() == blobName
+        b.hasVersionsOnly()
+    }
+
     def "List blobs prefix with comma"() {
         setup:
         def prefix = generateBlobName() + ", " + generateBlobName()
@@ -1303,6 +1320,29 @@ class ContainerAPITest extends APISpec {
         }
     }
 
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    def "list blobs hier options deleted with versions"() {
+        setup:
+        def blobName = generateBlobName()
+        def blob = cc.getBlobClient(blobName).getAppendBlobClient()
+        blob.create()
+        def metadata = new HashMap<String, String>()
+        metadata.put("foo", "bar")
+        blob.setMetadata(metadata)
+        blob.delete()
+        def options = new ListBlobsOptions().setPrefix(blobName)
+            .setDetails(new BlobListDetails().setRetrieveDeletedBlobsWithVersions(true))
+
+        when:
+        def blobs = cc.listBlobsByHierarchy("", options, null).iterator()
+
+        then:
+        def b = blobs.next()
+        !blobs.hasNext()
+        b.getName() == blobName
+        b.hasVersionsOnly()
+    }
+
     @Unroll
     def "List blobs hier options fail"() {
         when:
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json
new file mode 100644
index 000000000000..556128b6e9ad
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json
@@ -0,0 +1,112 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "230a2772-1c69-4408-9f21-2424e9a84d78"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E3D6FD9CB",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:51:17 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6d10ded9-c01e-0014-6917-5792ad000000",
+      "x-ms-client-request-id" : "230a2772-1c69-4408-9f21-2424e9a84d78",
+      "Date" : "Tue, 01 Jun 2021 18:51:17 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "4c66d24b-834b-4a3f-845f-996c3121ba78"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E3DB29E26",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:51:18 GMT",
+      "x-ms-version-id" : "2021-06-01T18:51:18.3475238Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6d10dfab-c01e-0014-5c17-5792ad000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "4c66d24b-834b-4a3f-845f-996c3121ba78",
+      "Date" : "Tue, 01 Jun 2021 18:51:18 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "eb48934a-df4c-47bf-90c5-945199f73eb1"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E3DCCBA9B",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:51:18 GMT",
+      "x-ms-version-id" : "2021-06-01T18:51:18.5196459Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6d10dfdc-c01e-0014-7c17-5792ad000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "eb48934a-df4c-47bf-90c5-945199f73eb1",
+      "Date" : "Tue, 01 Jun 2021 18:51:18 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "6d85a718-b07e-4d6e-ac99-3b622bdf53b3"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-delete-type-permanent" : "false",
+      "retry-after" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "6d10e00a-c01e-0014-1317-5792ad000000",
+      "x-ms-client-request-id" : "6d85a718-b07e-4d6e-ac99-3b622bdf53b3",
+      "Date" : "Tue, 01 Jun 2021 18:51:18 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d?restype=container&comp=list&prefix=8295186e18295186e767817414aac029851164b3b9b8&include=deletedwithversions",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7bf450cd-e0d3-45a1-b672-6e34f25fa9d2"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "6d10e03a-c01e-0014-2a17-5792ad000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"8295186e08295186e76780860dbc07e929472486d90d\"><Prefix>8295186e18295186e767817414aac029851164b3b9b8</Prefix><Blobs><Blob><Name>8295186e18295186e767817414aac029851164b3b9b8</Name><HasVersionsOnly>true</HasVersionsOnly><Properties><Creation-Time>Tue, 01 Jun 2021 18:51:18 GMT</Creation-Time><Last-Modified>Tue, 01 Jun 2021 18:51:18 GMT</Last-Modified><Etag>0x8D9252E3DCCBA9B</Etag><Content-Length>0</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5 /><Cache-Control /><Content-Disposition /><BlobType>AppendBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "7bf450cd-e0d3-45a1-b672-6e34f25fa9d2",
+      "Date" : "Tue, 01 Jun 2021 18:51:18 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "8295186e08295186e76780860dbc07e929472486d90d", "8295186e18295186e767817414aac029851164b3b9b8" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json
new file mode 100644
index 000000000000..62ca418c4b0a
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json
@@ -0,0 +1,112 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "13f95fba-b06f-4ac1-8f87-41bbd13d6845"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E2EEF2C55",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:50:53 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "c1d30bd1-e01e-0013-0717-57fece000000",
+      "x-ms-client-request-id" : "13f95fba-b06f-4ac1-8f87-41bbd13d6845",
+      "Date" : "Tue, 01 Jun 2021 18:50:52 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "06615617-d81d-4083-9358-a120d707f7ef"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E2F317F9E",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:50:54 GMT",
+      "x-ms-version-id" : "2021-06-01T18:50:54.0132254Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "c1d30c55-e01e-0013-7217-57fece000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "06615617-d81d-4083-9358-a120d707f7ef",
+      "Date" : "Tue, 01 Jun 2021 18:50:53 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3?comp=metadata",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0638132e-5519-4644-96f2-fca545f7f3cf"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D9252E2F4112D8",
+      "Last-Modified" : "Tue, 01 Jun 2021 18:50:54 GMT",
+      "x-ms-version-id" : "2021-06-01T18:50:54.1172991Z",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "c1d30c8d-e01e-0013-2417-57fece000000",
+      "x-ms-request-server-encrypted" : "true",
+      "x-ms-client-request-id" : "0638132e-5519-4644-96f2-fca545f7f3cf",
+      "Date" : "Tue, 01 Jun 2021 18:50:53 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "DELETE",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "e8931cba-3b55-40cd-ae18-2f6a0db7f608"
+    },
+    "Response" : {
+      "content-length" : "0",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-delete-type-permanent" : "false",
+      "retry-after" : "0",
+      "StatusCode" : "202",
+      "x-ms-request-id" : "c1d30cc2-e01e-0013-5417-57fece000000",
+      "x-ms-client-request-id" : "e8931cba-3b55-40cd-ae18-2f6a0db7f608",
+      "Date" : "Tue, 01 Jun 2021 18:50:53 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "GET",
+    "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90?restype=container&comp=list&prefix=bd465e191bd465e19dd460231e493f5fe94664b838a3&delimiter=&include=deletedwithversions",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d0616405-0176-47cd-9682-76988c45dfdc"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "x-ms-request-id" : "c1d30cfd-e01e-0013-0217-57fece000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://seanmcccanary3.blob.core.windows.net/\" ContainerName=\"bd465e190bd465e19dd42664791b7d0f52cdc4260b90\"><Prefix>bd465e191bd465e19dd460231e493f5fe94664b838a3</Prefix><Blobs><Blob><Name>bd465e191bd465e19dd460231e493f5fe94664b838a3</Name><HasVersionsOnly>true</HasVersionsOnly><Properties><Creation-Time>Tue, 01 Jun 2021 18:50:54 GMT</Creation-Time><Last-Modified>Tue, 01 Jun 2021 18:50:54 GMT</Last-Modified><Etag>0x8D9252E2F4112D8</Etag><Content-Length>0</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-CRC64 /><Content-MD5 /><Cache-Control /><Content-Disposition /><BlobType>AppendBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata /></Blob></Blobs><NextMarker /></EnumerationResults>",
+      "x-ms-client-request-id" : "d0616405-0176-47cd-9682-76988c45dfdc",
+      "Date" : "Tue, 01 Jun 2021 18:50:53 GMT",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "bd465e190bd465e19dd42664791b7d0f52cdc4260b90", "bd465e191bd465e19dd460231e493f5fe94664b838a3" ]
+}
\ No newline at end of file

From a5d3f394bb8e89549b276647388e8b937737a5ee Mon Sep 17 00:00:00 2001
From: Gauri Prasad <51212198+gapra-msft@users.noreply.github.com>
Date: Fri, 18 Jun 2021 14:31:47 -0700
Subject: [PATCH 8/9] Addressed comments for immutable storage with versioning
 (#22388)

---
 .../models/InternalBlobLegalHoldResult.java   | 29 +++++++++
 .../util/BlobRequestConditionProperty.java    | 13 ++++
 .../blob/implementation/util/ModelHelper.java | 37 ++++++++++++
 .../blob/models/BlobLegalHoldResult.java      | 16 +----
 .../blob/specialized/BlobAsyncClientBase.java | 16 +++--
 .../ImmutableStorageWithVersioningTest.groovy | 60 +++++++++++--------
 ...oningTestSetImmutabilityPolicyACIA[0].json | 51 ++++++++++++++++
 ...oningTestSetImmutabilityPolicyACIA[1].json | 51 ++++++++++++++++
 ...oningTestSetImmutabilityPolicyACIA[2].json | 51 ++++++++++++++++
 ...oningTestSetImmutabilityPolicyACIA[3].json | 51 ++++++++++++++++
 ...oningTestSetImmutabilityPolicyACIA[4].json | 51 ++++++++++++++++
 11 files changed, 382 insertions(+), 44 deletions(-)
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/InternalBlobLegalHoldResult.java
 create mode 100644 sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobRequestConditionProperty.java
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[0].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[1].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[2].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[3].json
 create mode 100644 sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[4].json

diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/InternalBlobLegalHoldResult.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/InternalBlobLegalHoldResult.java
new file mode 100644
index 000000000000..a2b07af0a161
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/InternalBlobLegalHoldResult.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.azure.storage.blob.models.BlobLegalHoldResult;
+
+/**
+ * The blob legal hold result.
+ */
+public class InternalBlobLegalHoldResult implements BlobLegalHoldResult {
+
+    private final boolean hasLegalHold;
+
+    /**
+     * Creates a new BlobLegalHoldResult
+     * @param hasLegalHold whether or not a legal hold is enabled on the blob.
+     */
+    public InternalBlobLegalHoldResult(boolean hasLegalHold) {
+        this.hasLegalHold = hasLegalHold;
+    }
+
+    /**
+     * @return whether or not a legal hold is enabled on the blob.
+     */
+    public boolean hasLegalHold() {
+        return hasLegalHold;
+    }
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobRequestConditionProperty.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobRequestConditionProperty.java
new file mode 100644
index 000000000000..8040c6126095
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/BlobRequestConditionProperty.java
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob.implementation.util;
+
+public enum BlobRequestConditionProperty {
+    LEASE_ID,
+    TAGS_CONDITIONS,
+    IF_MODIFIED_SINCE,
+    IF_UNMODIFIED_SINCE,
+    IF_MATCH,
+    IF_NONE_MATCH;
+}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
index 1516679aeba4..1afb9de4ac41 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java
@@ -24,6 +24,7 @@
 import com.azure.storage.blob.models.BlobItemProperties;
 import com.azure.storage.blob.models.BlobLeaseRequestConditions;
 import com.azure.storage.blob.models.BlobQueryHeaders;
+import com.azure.storage.blob.models.BlobRequestConditions;
 import com.azure.storage.blob.models.ObjectReplicationPolicy;
 import com.azure.storage.blob.models.ObjectReplicationRule;
 import com.azure.storage.blob.models.ObjectReplicationStatus;
@@ -37,6 +38,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -500,4 +502,39 @@ public static BlobQueryHeaders transformQueryHeaders(HttpHeaders headers) {
             throw LOGGER.logExceptionAsError(new RuntimeException(e));
         }
     }
+
+    public static void validateConditionsNotPresent(BlobRequestConditions requestConditions,
+        EnumSet<BlobRequestConditionProperty> invalidConditions) {
+        if (requestConditions == null) {
+            return;
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.LEASE_ID)
+            && requestConditions.getLeaseId() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'leaseId' is not applicable to this API."));
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.TAGS_CONDITIONS)
+            && requestConditions.getTagsConditions() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'tagsConditions' is not applicable to "
+                + "this API."));
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.IF_MODIFIED_SINCE)
+            && requestConditions.getIfModifiedSince() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'ifModifiedSince' is not applicable to "
+                + "this API."));
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.IF_UNMODIFIED_SINCE)
+            && requestConditions.getIfUnmodifiedSince() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'ifUnmodifiedSince' is not applicable to "
+                + "this API."));
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.IF_MATCH)
+            && requestConditions.getIfMatch() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'ifMatch' is not applicable to this API."));
+        }
+        if (invalidConditions.contains(BlobRequestConditionProperty.IF_NONE_MATCH)
+            && requestConditions.getIfNoneMatch() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("'ifNoneMatch' is not applicable to this "
+                + "API."));
+        }
+    }
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
index a25179528491..a174a24933c2 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobLegalHoldResult.java
@@ -6,22 +6,10 @@
 /**
  * The blob legal hold result.
  */
-public class BlobLegalHoldResult {
-
-    private final boolean hasLegalHold;
-
-    /**
-     * Creates a new BlobLegalHoldResult
-     * @param hasLegalHold whether or not a legal hold is enabled on the blob.
-     */
-    public BlobLegalHoldResult(boolean hasLegalHold) {
-        this.hasLegalHold = hasLegalHold;
-    }
+public interface BlobLegalHoldResult {
 
     /**
      * @return whether or not a legal hold is enabled on the blob.
      */
-    public boolean hasLegalHold() {
-        return hasLegalHold;
-    }
+    boolean hasLegalHold();
 }
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
index 4e66bcaa6aa8..e5d0d664ab80 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
@@ -34,19 +34,21 @@
 import com.azure.storage.blob.implementation.models.BlobsSetImmutabilityPolicyHeaders;
 import com.azure.storage.blob.implementation.models.BlobsStartCopyFromURLHeaders;
 import com.azure.storage.blob.implementation.models.EncryptionScope;
+import com.azure.storage.blob.implementation.models.InternalBlobLegalHoldResult;
 import com.azure.storage.blob.implementation.models.QueryRequest;
 import com.azure.storage.blob.implementation.models.QuerySerialization;
 import com.azure.storage.blob.implementation.util.BlobQueryReader;
+import com.azure.storage.blob.implementation.util.BlobRequestConditionProperty;
 import com.azure.storage.blob.implementation.util.BlobSasImplUtil;
 import com.azure.storage.blob.implementation.util.ChunkedDownloadUtils;
 import com.azure.storage.blob.implementation.util.ModelHelper;
 import com.azure.storage.blob.models.AccessTier;
 import com.azure.storage.blob.models.ArchiveStatus;
-import com.azure.storage.blob.models.BlobDownloadContentAsyncResponse;
-import com.azure.storage.blob.models.BlobDownloadHeaders;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
 import com.azure.storage.blob.models.BlobCopyInfo;
 import com.azure.storage.blob.models.BlobDownloadAsyncResponse;
+import com.azure.storage.blob.models.BlobDownloadContentAsyncResponse;
+import com.azure.storage.blob.models.BlobDownloadHeaders;
 import com.azure.storage.blob.models.BlobHttpHeaders;
 import com.azure.storage.blob.models.BlobImmutabilityPolicy;
 import com.azure.storage.blob.models.BlobImmutabilityPolicyMode;
@@ -99,6 +101,7 @@
 import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -2240,7 +2243,12 @@ Mono<Response<BlobImmutabilityPolicy>> setImmutabilityPolicyWithResponse(
 
         BlobRequestConditions finalRequestConditions = requestConditions == null
             ? new BlobRequestConditions() : requestConditions;
-        // TODO (gapra) : Discuss, should we just expose ifUnmodifiedSince here?
+
+        ModelHelper.validateConditionsNotPresent(finalRequestConditions,
+            EnumSet.of(BlobRequestConditionProperty.LEASE_ID, BlobRequestConditionProperty.TAGS_CONDITIONS,
+                BlobRequestConditionProperty.IF_MATCH, BlobRequestConditionProperty.IF_NONE_MATCH,
+                BlobRequestConditionProperty.IF_MODIFIED_SINCE));
+
         return this.azureBlobStorage.getBlobs().setImmutabilityPolicyWithResponseAsync(containerName, blobName, null,
             null, finalRequestConditions.getIfUnmodifiedSince(), finalImmutabilityPolicy.getExpiryTime(),
             finalImmutabilityPolicy.getPolicyMode(),
@@ -2349,6 +2357,6 @@ Mono<Response<BlobLegalHoldResult>> setLegalHoldWithResponse(boolean legalHold,
             legalHold, null, null,
             context.addData(AZ_TRACING_NAMESPACE_KEY, STORAGE_TRACING_NAMESPACE_VALUE))
             .map(response -> new SimpleResponse<>(response,
-                new BlobLegalHoldResult(response.getDeserializedHeaders().isXMsLegalHold())));
+                new InternalBlobLegalHoldResult(response.getDeserializedHeaders().isXMsLegalHold())));
     }
 }
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
index aaf441258acd..7cbed8318295 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy
@@ -48,9 +48,11 @@ import spock.lang.Unroll
 import java.nio.ByteBuffer
 import java.nio.charset.StandardCharsets
 import java.time.Duration
-import java.time.temporal.ChronoUnit
+ import java.time.OffsetDateTime
+ import java.time.temporal.ChronoUnit
 
 @ResourceLock("ManagementPlaneThrottling")
+@RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
 class ImmutableStorageWithVersioningTest extends APISpec {
 
     private BlobContainerClient vlwContainer;
@@ -65,7 +67,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
 
     def setup() {
         containerName = generateContainerName()
-
         if (env.testMode != TestMode.PLAYBACK) {
             String url = String.format("https://management.azure.com/subscriptions/%s/resourceGroups/%s/providers/"
                 + "Microsoft.Storage/storageAccounts/%s/blobServices/default/containers/%s?api-version=%s", subscriptionId,
@@ -138,7 +139,7 @@ class ImmutableStorageWithVersioningTest extends APISpec {
                         if (blob.getProperties().hasLegalHold()) {
                             blobClient.setLegalHold(false)
                         }
-                        if (blob.getProperties().getImmutabilityPolicyMode() != null) {
+                        if (blob.getProperties().getImmutabilityPolicy().getPolicyMode() != null) {
                             sleepIfRecord(5 * 1000)
                             blobClient.deleteImmutabilityPolicy()
                         }
@@ -156,7 +157,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
 
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "set immutability policy min"() {
         setup:
         def expiryTime = getNamer().getUtcNow().plusSeconds(2)
@@ -175,7 +175,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         BlobImmutabilityPolicyMode.UNLOCKED == response.getPolicyMode()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Unroll
     def "set immutability policy"() {
         setup:
@@ -218,7 +217,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         BlobImmutabilityPolicyMode.UNLOCKED || _
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Unroll
     def "set immutability policy AC"() {
         setup:
@@ -241,7 +239,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         newDate    || _
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "set immutability policy AC fail"() {
         setup:
         def bac = new BlobRequestConditions()
@@ -259,7 +256,36 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         e.getErrorCode() == BlobErrorCode.CONDITION_NOT_MET
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
+    @Unroll
+    def "set immutability policy AC IA"() {
+        setup:
+        def bac = new BlobRequestConditions()
+            .setLeaseId(leaseId)
+            .setTagsConditions(tags)
+            .setIfMatch(ifMatch)
+            .setIfNoneMatch(ifNoneMatch)
+            .setIfModifiedSince(ifModifiedSince)
+        def expiryTime = getNamer().getUtcNow().plusSeconds(2)
+        def immutabilityPolicy = new BlobImmutabilityPolicy()
+            .setExpiryTime(expiryTime)
+            .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED)
+
+        when:
+        vlwBlob.setImmutabilityPolicyWithResponse(immutabilityPolicy, bac, null, null)
+
+        then:
+        def e = thrown(IllegalArgumentException)
+        e.getMessage() == wrongCondition + " is not applicable to this API."
+
+        where:
+        leaseId     | tags              | ifMatch   | ifNoneMatch   | ifModifiedSince    || wrongCondition
+        "leaseId"   | null              | null      | null          | null               || "'leaseId'"
+        null        | "tagsConditions"  | null      | null          | null               || "'tagsConditions'"
+        null        | null              | "ifMatch" | null          | null               || "'ifMatch'"
+        null        | null              | null      | "ifNoneMatch" | null               || "'ifNoneMatch'"
+        null        | null              | null      | null          | oldDate            || "'ifModifiedSince'"
+    }
+
     def "set immutability policy error"() {
         setup:
         def blob = vlwContainer.getBlobClient(generateBlobName())
@@ -276,7 +302,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "set immutability policy IA"() {
         setup:
         def expiryTime = getNamer().getUtcNow().plusSeconds(2)
@@ -292,7 +317,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         e.getMessage() == "immutabilityPolicy.policyMode must be Locked or Unlocked"
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "delete immutability policy min"() {
         setup:
         def expiryTime = getNamer().getUtcNow().plusSeconds(2)
@@ -310,7 +334,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         properties.getImmutabilityPolicy().getExpiryTime() == null
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "delete immutability policy"() {
         setup:
         def expiryTime = getNamer().getUtcNow().plusSeconds(2)
@@ -328,7 +351,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         properties.getImmutabilityPolicy().getExpiryTime() == null
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "delete immutability policy error"() {
         setup:
         def blob = vlwContainer.getBlobClient(generateBlobName())
@@ -341,7 +363,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Unroll
     def "set legal hold min"() {
         when:
@@ -356,7 +377,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         false     || _
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Unroll
     def "set legal hold"() {
         when: "set legal hold"
@@ -387,7 +407,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         false     || _
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "set legal hold error"() {
         setup:
         def blob = vlwContainer.getBlobClient(generateBlobName())
@@ -400,7 +419,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         e.getErrorCode() == BlobErrorCode.BLOB_NOT_FOUND
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "container properties"() {
         when:
         def response = vlwContainer.getProperties()
@@ -417,7 +435,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         container.getProperties().isImmutableStorageWithVersioningEnabled()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "append blob create"() {
         setup:
         def appendBlob = vlwContainer.getBlobClient(generateBlobName()).getAppendBlobClient()
@@ -440,7 +457,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "page blob create"() {
         setup:
         def pageBlob = vlwContainer.getBlobClient(generateBlobName()).getPageBlobClient()
@@ -463,7 +479,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "block blob commit block list"() {
         setup:
         def blockBlob = vlwBlob.getBlockBlobClient()
@@ -486,7 +501,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "block blob upload"() {
         setup:
         def blockBlob = vlwBlob.getBlockBlobClient()
@@ -509,7 +523,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     @Unroll
     @LiveOnly
     def "blob upload"() {
@@ -539,7 +552,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         null      || _ // Tests single shot upload
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "sync copy"() {
         setup:
         vlwContainer.setAccessPolicy(PublicAccessType.CONTAINER, null)
@@ -566,7 +578,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         vlwContainer.setAccessPolicy(null, null)
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "copy"() {
         setup:
         def destination = vlwContainer.getBlobClient(generateBlobName()).getBlockBlobClient()
@@ -591,7 +602,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
     }
 
     /* SAS tests */
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "account sas"() {
         setup:
         def expiryTime = namer.getUtcNow().plusDays(1)
@@ -622,7 +632,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         !response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "container sas"() {
         setup:
         def expiryTime = namer.getUtcNow().plusDays(1)
@@ -651,7 +660,6 @@ class ImmutableStorageWithVersioningTest extends APISpec {
         !response.hasLegalHold()
     }
 
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02")
     def "blob sas"() {
         setup:
         def expiryTime = namer.getUtcNow().plusDays(1)
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[0].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[0].json
new file mode 100644
index 000000000000..4f3f34498bc4
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[0].json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1e8e8c1301e8e8c13d1e4448478653498e9004a219f2?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "da7835f2-2cb0-40eb-9f13-0e808de4b12f"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D93288C91D6509",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:12 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "fc34c3f0-f01e-0001-1571-649c3e000000",
+      "x-ms-client-request-id" : "da7835f2-2cb0-40eb-9f13-0e808de4b12f",
+      "Date" : "Fri, 18 Jun 2021 18:42:11 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/1e8e8c1311e8e8c13d1e86956ffcc18240e2b4ad1b61/1e8e8c1321e8e8c13d1e55651a3205039d57541cc88c",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "b96decb4-acca-4a6c-ada0-f82fe8090be7",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:15 GMT",
+      "x-ms-version-id" : "2021-06-18T18:42:15.2590905Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 18 Jun 2021 18:42:15 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D93288CB03A639",
+      "x-ms-request-id" : "fc34c401-f01e-0001-2271-649c3e000000",
+      "x-ms-client-request-id" : "b96decb4-acca-4a6c-ada0-f82fe8090be7"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "1e8e8c1301e8e8c13d1e4448478653498e9004a219f2", "1e8e8c1311e8e8c13d1e86956ffcc18240e2b4ad1b61", "1e8e8c1321e8e8c13d1e55651a3205039d57541cc88c", "2021-06-18T18:42:16.251301Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[1].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[1].json
new file mode 100644
index 000000000000..08ba8e7080c0
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[1].json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0795bd5200795bd5264a871964e42487c620d4113860?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "57037666-1f95-4d07-9930-802b4c50fce4"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D93288CC0E4AE6",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:17 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "fc34c419-f01e-0001-3671-649c3e000000",
+      "x-ms-client-request-id" : "57037666-1f95-4d07-9930-802b4c50fce4",
+      "Date" : "Fri, 18 Jun 2021 18:42:16 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/0795bd5210795bd5264a783820c02b3169fc34074a83/0795bd5220795bd5264a93710522f48ec6a7f418d8e3",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "f6693c7e-5d3d-4091-9256-e17a00c03888",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:19 GMT",
+      "x-ms-version-id" : "2021-06-18T18:42:19.0179529Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 18 Jun 2021 18:42:18 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D93288CD4134C9",
+      "x-ms-request-id" : "fc34c428-f01e-0001-4271-649c3e000000",
+      "x-ms-client-request-id" : "f6693c7e-5d3d-4091-9256-e17a00c03888"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "0795bd5200795bd5264a871964e42487c620d4113860", "0795bd5210795bd5264a783820c02b3169fc34074a83", "0795bd5220795bd5264a93710522f48ec6a7f418d8e3", "2021-06-18T18:42:19.976318300Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[2].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[2].json
new file mode 100644
index 000000000000..155f44569994
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[2].json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/2cb8ee9102cb8ee9164102835a79ea298db1a4894aae?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "fd680b20-cd02-4150-b4c3-ce35d27c7128"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D93288CE06EB2B",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:20 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "fc34c440-f01e-0001-5171-649c3e000000",
+      "x-ms-client-request-id" : "fd680b20-cd02-4150-b4c3-ce35d27c7128",
+      "Date" : "Fri, 18 Jun 2021 18:42:20 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/2cb8ee9112cb8ee9164137518b52f87282b0941deb76/2cb8ee9122cb8ee9164196392ec1ff16ca250421c830",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "8a2d1417-399a-449b-91d6-9b63894ecbbc",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:21 GMT",
+      "x-ms-version-id" : "2021-06-18T18:42:21.4295815Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 18 Jun 2021 18:42:21 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D93288CEB13107",
+      "x-ms-request-id" : "fc34c44e-f01e-0001-5a71-649c3e000000",
+      "x-ms-client-request-id" : "8a2d1417-399a-449b-91d6-9b63894ecbbc"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "2cb8ee9102cb8ee9164102835a79ea298db1a4894aae", "2cb8ee9112cb8ee9164137518b52f87282b0941deb76", "2cb8ee9122cb8ee9164196392ec1ff16ca250421c830", "2021-06-18T18:42:22.389302800Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[3].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[3].json
new file mode 100644
index 000000000000..43467d72fb00
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[3].json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/35a3dfd0035a3dfd06a9905570e076781bcfc459ab19?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "5e16c32a-29b4-47b4-908f-218e8bca0407"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D93288CF773572",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:22 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "fc34c459-f01e-0001-6471-649c3e000000",
+      "x-ms-client-request-id" : "5e16c32a-29b4-47b4-908f-218e8bca0407",
+      "Date" : "Fri, 18 Jun 2021 18:42:22 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/35a3dfd0135a3dfd06a986521d0138992e11d49bda42/35a3dfd0235a3dfd06a92931554d601c5752c41d4a1d",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "d21b6c89-5215-416f-8aeb-1c91a5e2e8ec",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:23 GMT",
+      "x-ms-version-id" : "2021-06-18T18:42:23.7032885Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 18 Jun 2021 18:42:23 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D93288D00C21B5",
+      "x-ms-request-id" : "fc34c460-f01e-0001-6971-649c3e000000",
+      "x-ms-client-request-id" : "d21b6c89-5215-416f-8aeb-1c91a5e2e8ec"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "35a3dfd0035a3dfd06a9905570e076781bcfc459ab19", "35a3dfd0135a3dfd06a986521d0138992e11d49bda42", "35a3dfd0235a3dfd06a92931554d601c5752c41d4a1d", "2021-06-18T18:42:24.657302800Z" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[4].json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[4].json
new file mode 100644
index 000000000000..8ec72aeea119
--- /dev/null
+++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ImmutableStorageWithVersioningTestSetImmutabilityPolicyACIA[4].json
@@ -0,0 +1,51 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7ae2491707ae24917e0e112126fda4915ca294f5e942?restype=container",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "dd31cb6e-af83-4c93-9e7d-decd45935e0a"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "eTag" : "0x8D93288D0CC3382",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:24 GMT",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "fc34c46e-f01e-0001-7571-649c3e000000",
+      "x-ms-client-request-id" : "dd31cb6e-af83-4c93-9e7d-decd45935e0a",
+      "Date" : "Fri, 18 Jun 2021 18:42:24 GMT"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://REDACTED.blob.core.windows.net/7ae2491717ae24917e0e668618a86a9b9006a4da9913/7ae2491727ae24917e0e80803ccac87d6b83647ba9ba",
+    "Headers" : {
+      "x-ms-version" : "2020-10-02",
+      "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "0b92404f-d4d0-44db-8aed-950801357fcb",
+      "Content-Type" : "application/octet-stream"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-ms-version" : "2020-10-02",
+      "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-content-crc64" : "AAAAAAAAAAA=",
+      "Last-Modified" : "Fri, 18 Jun 2021 18:42:25 GMT",
+      "x-ms-version-id" : "2021-06-18T18:42:25.9120332Z",
+      "retry-after" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-server-encrypted" : "true",
+      "Date" : "Fri, 18 Jun 2021 18:42:25 GMT",
+      "Content-MD5" : "1B2M2Y8AsgTpgAmY7PhCfg==",
+      "eTag" : "0x8D93288D15D28CC",
+      "x-ms-request-id" : "fc34c47b-f01e-0001-7e71-649c3e000000",
+      "x-ms-client-request-id" : "0b92404f-d4d0-44db-8aed-950801357fcb"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "7ae2491707ae24917e0e112126fda4915ca294f5e942", "7ae2491717ae24917e0e668618a86a9b9006a4da9913", "7ae2491727ae24917e0e80803ccac87d6b83647ba9ba", "2021-06-18T18:42:26.864331800Z" ]
+}
\ No newline at end of file

From b3aac3d4f6fde00f17331cb6a189b3709f0b52ff Mon Sep 17 00:00:00 2001
From: Kamil Sobol <61715331+kasobol-msft@users.noreply.github.com>
Date: Thu, 24 Jun 2021 09:34:04 -0700
Subject: [PATCH 9/9] Develop on main, part 1 (#22451)

* move back service version.

* pin CI.

* fix ci.

* fix ci ?

* fix live tests ?

* use latest service version to filter if not specified in variable.

* use latest service version to filter if not specified in variable.

* does this work ??

* missing stuff.

* move that piece to parent as well.

* rollback yml changes in favor of pom.xml

* fix build ?

* how about this ?

* more ?

* not this.

* rollback some.

* does this work ??
---
 eng/DependencyGraph/gen-dep-graph-data.ps1    |  8 +++---
 sdk/parents/azure-client-sdk-parent/pom.xml   |  4 +++
 sdk/storage/azure-storage-blob-batch/pom.xml  |  1 +
 .../azure-storage-blob-changefeed/pom.xml     |  1 +
 .../azure-storage-blob-cryptography/pom.xml   |  1 +
 sdk/storage/azure-storage-blob-nio/pom.xml    |  1 +
 sdk/storage/azure-storage-blob/pom.xml        |  1 +
 .../storage/blob/BlobServiceVersion.java      |  2 +-
 .../azure-storage-common/ci.system.properties |  2 ++
 .../common/implementation/Constants.java      |  2 +-
 .../RequiredServiceVersionExtension.java      | 25 ++++++++++++++-----
 .../azure-storage-file-datalake/pom.xml       |  1 +
 .../file/datalake/DataLakeServiceVersion.java |  2 +-
 sdk/storage/azure-storage-file-share/pom.xml  |  4 +++
 .../file/share/ShareServiceVersion.java       |  2 +-
 sdk/storage/azure-storage-queue/pom.xml       |  4 +++
 .../storage/queue/QueueServiceVersion.java    |  2 +-
 17 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 sdk/storage/azure-storage-common/ci.system.properties

diff --git a/eng/DependencyGraph/gen-dep-graph-data.ps1 b/eng/DependencyGraph/gen-dep-graph-data.ps1
index d3540a9f60bc..0e1e6084cfcd 100644
--- a/eng/DependencyGraph/gen-dep-graph-data.ps1
+++ b/eng/DependencyGraph/gen-dep-graph-data.ps1
@@ -47,7 +47,7 @@ class Library {
         $retString += "    `"deps`": [`n"
         $first = $true
         foreach($item in $this.DepHash.GetEnumerator() | Sort-Object Name)
-        {   
+        {
             if (!$first)
             {
                 $retString += ",`n"
@@ -62,7 +62,7 @@ class Library {
     }
 }
 
-# While this is similar to library there are no dependencies and the 
+# While this is similar to library there are no dependencies and the
 # type will be "internalbinary". This entry is applicable to client libraries
 # which aren't being built AKA dependencies. Note: If we opt to include
 # external_dependencies then the type will be "external".
@@ -70,7 +70,7 @@ class Dependency {
     [string]$id # <groupId>:<artifactId>:<version>
     [string]$name # <groupId>:<artifactId>
     [string]$version
-    [string]$type = "internalbinary" 
+    [string]$type = "internalbinary"
     Dependency(
         [string]$groupId,
         [string]$artifactId,
@@ -116,7 +116,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
 
     $xmlPomFile = New-Object xml
     $xmlPomFile.Load($pomFile)
-    if ($ValidParents -notcontains $xmlPomFile.project.parent.artifactId) 
+    if ($ValidParents -notcontains $xmlPomFile.project.parent.artifactId)
     {
         return
     }
diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
index 4cc99452d6f6..62ae0b413d1f 100644
--- a/sdk/parents/azure-client-sdk-parent/pom.xml
+++ b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -1159,6 +1159,7 @@
               <systemPropertyVariables>
                 <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
               </systemPropertyVariables>
+              <systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
             </configuration>
           </plugin>
         </plugins>
@@ -1183,6 +1184,7 @@
               <systemPropertyVariables>
                 <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
               </systemPropertyVariables>
+              <systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
             </configuration>
           </plugin>
         </plugins>
@@ -1206,6 +1208,7 @@
               <systemPropertyVariables>
                 <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
               </systemPropertyVariables>
+              <systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
             </configuration>
           </plugin>
         </plugins>
@@ -1230,6 +1233,7 @@
               <systemPropertyVariables>
                 <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
               </systemPropertyVariables>
+              <systemPropertiesFile>${AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE}</systemPropertiesFile>
             </configuration>
           </plugin>
         </plugins>
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
index 49d205f79c09..f55a01f9aa28 100644
--- a/sdk/storage/azure-storage-blob-batch/pom.xml
+++ b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -35,6 +35,7 @@
   <properties>
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <pluginRepositories>
diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml
index 2faac9993e50..c223ff6651a7 100644
--- a/sdk/storage/azure-storage-blob-changefeed/pom.xml
+++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml
@@ -35,6 +35,7 @@
   <properties>
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <pluginRepositories>
diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
index 090e827fa8a6..1a195e21a257 100644
--- a/sdk/storage/azure-storage-blob-cryptography/pom.xml
+++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -35,6 +35,7 @@
   <properties>
     <jacoco.min.linecoverage>0.18</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0.09</jacoco.min.branchcoverage>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <dependencies>
diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml
index b07acc038270..f035af7092b4 100644
--- a/sdk/storage/azure-storage-blob-nio/pom.xml
+++ b/sdk/storage/azure-storage-blob-nio/pom.xml
@@ -34,6 +34,7 @@
   <properties>
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <pluginRepositories>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index e84761c32cfa..d38f9b4d6043 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -35,6 +35,7 @@
   <properties>
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <pluginRepositories>
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
index bfe0d4b5b3e7..bdfbed88e68e 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java
@@ -38,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link BlobServiceVersion}
      */
     public static BlobServiceVersion getLatest() {
-        return V2020_10_02;
+        return V2020_08_04;
     }
 }
diff --git a/sdk/storage/azure-storage-common/ci.system.properties b/sdk/storage/azure-storage-common/ci.system.properties
new file mode 100644
index 000000000000..dae2d9857f25
--- /dev/null
+++ b/sdk/storage/azure-storage-common/ci.system.properties
@@ -0,0 +1,2 @@
+AZURE_LIVE_TEST_SERVICE_VERSION=V2020_10_02
+AZURE_STORAGE_SAS_SERVICE_VERSION=2020-10-02
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
index 432cb7b310b0..87a89e5a525d 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java
@@ -78,7 +78,7 @@ public final class Constants {
     public static final String PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION = "AZURE_STORAGE_SAS_SERVICE_VERSION";
 
     public static final String SAS_SERVICE_VERSION = Configuration.getGlobalConfiguration()
-        .get(PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION, "2020-10-02");
+        .get(PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION, "2020-08-04");
 
     private Constants() {
     }
diff --git a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/extensions/RequiredServiceVersionExtension.java b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/extensions/RequiredServiceVersionExtension.java
index aaddf445dac0..8134942d0e9f 100644
--- a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/extensions/RequiredServiceVersionExtension.java
+++ b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/extensions/RequiredServiceVersionExtension.java
@@ -8,11 +8,13 @@
 import org.spockframework.runtime.model.FeatureInfo;
 import org.spockframework.runtime.model.SpecInfo;
 
+import java.lang.reflect.InvocationTargetException;
+
 public class RequiredServiceVersionExtension implements IAnnotationDrivenExtension<RequiredServiceVersion> {
 
     @Override
     public void visitFeatureAnnotation(RequiredServiceVersion annotation, FeatureInfo feature) {
-        String targetServiceVersion = TestEnvironment.getInstance().getServiceVersion();
+        Enum targetServiceVersion = getTargetServiceVersion(annotation.clazz());
         String minServiceVersion = annotation.min();
         if (shouldSkip(targetServiceVersion, minServiceVersion, annotation.clazz())) {
             feature.skip(String.format("Test ignored to run with %s service version", targetServiceVersion));
@@ -21,19 +23,30 @@ public void visitFeatureAnnotation(RequiredServiceVersion annotation, FeatureInf
 
     @Override
     public void visitSpecAnnotation(RequiredServiceVersion annotation, SpecInfo spec) {
-        String targetServiceVersion = TestEnvironment.getInstance().getServiceVersion();
+        Enum targetServiceVersion = getTargetServiceVersion(annotation.clazz());
         String minServiceVersion = annotation.min();
         if (shouldSkip(targetServiceVersion, minServiceVersion, annotation.clazz())) {
             spec.skip(String.format("Test ignored to run with %s service version", targetServiceVersion));
         }
     }
 
-    private boolean shouldSkip(String targetServiceVersion, String minServiceVersion, Class clazz) {
-        if (targetServiceVersion == null) {
-            return false;
+    private Enum getTargetServiceVersion(Class clazz) {
+        String targetServiceVersionFromEnvironment = TestEnvironment.getInstance().getServiceVersion();
+        if (targetServiceVersionFromEnvironment != null) {
+            // Use environment defined version first.
+            return Enum.valueOf(clazz, targetServiceVersionFromEnvironment);
+        } else {
+            // Fall back to "latest" service version otherwise.
+            try {
+                return (Enum) clazz.getMethod("getLatest").invoke(null);
+            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                throw new RuntimeException(e);
+            }
         }
+    }
 
-        int targetOrdinal = Enum.valueOf(clazz, targetServiceVersion).ordinal();
+    private boolean shouldSkip(Enum targetServiceVersion, String minServiceVersion, Class clazz) {
+        int targetOrdinal = targetServiceVersion.ordinal();
         int minOrdinal = Enum.valueOf(clazz, minServiceVersion).ordinal();
         return targetOrdinal < minOrdinal;
     }
diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml
index dd1d44ee7d8d..9e746e0b9e84 100644
--- a/sdk/storage/azure-storage-file-datalake/pom.xml
+++ b/sdk/storage/azure-storage-file-datalake/pom.xml
@@ -35,6 +35,7 @@
   <properties>
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
   </properties>
 
   <pluginRepositories>
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
index 4152f1c501c1..0f297093d777 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java
@@ -38,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link DataLakeServiceVersion}
      */
     public static DataLakeServiceVersion getLatest() {
-        return V2020_10_02;
+        return V2020_08_04;
     }
 }
diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml
index 1b0c8c07d920..4f0c74a0f7a2 100644
--- a/sdk/storage/azure-storage-file-share/pom.xml
+++ b/sdk/storage/azure-storage-file-share/pom.xml
@@ -32,6 +32,10 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
index b383bb3e4a59..43e485041c71 100644
--- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
+++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java
@@ -39,6 +39,6 @@ public String getVersion() {
      * @return the latest {@link ShareServiceVersion}
      */
     public static ShareServiceVersion getLatest() {
-        return V2020_10_02;
+        return V2020_08_04;
     }
 }
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index 315567f3172a..9bed28abd182 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -32,6 +32,10 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
index 6f6cb7aa4aa0..0ad04bd10a1f 100644
--- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
+++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java
@@ -38,6 +38,6 @@ public String getVersion() {
      * @return the latest {@link QueueServiceVersion}
      */
     public static QueueServiceVersion getLatest() {
-        return V2020_10_02;
+        return V2020_08_04;
     }
 }