diff --git a/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py b/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
index 4ef15a5ee2d..a50414c6120 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
@@ -195,8 +195,16 @@ def get_account_url(cli_ctx, account_name, service):
     return "https://{}.{}.{}".format(account_name, service, storage_endpoint)
 
 
+def _config_location_mode(kwargs, client_kwargs):
+    location_mode = kwargs.pop('location_mode', None)
+    if location_mode:
+        client_kwargs['_location_mode'] = location_mode
+    return client_kwargs
+
+
 def cf_blob_service(cli_ctx, kwargs):
     client_kwargs = _prepare_client_kwargs_track2(cli_ctx)
+    client_kwargs = _config_location_mode(kwargs, client_kwargs)
     t_blob_service = get_sdk(cli_ctx, ResourceType.DATA_STORAGE_BLOB,
                              '_blob_service_client#BlobServiceClient')
     connection_string = kwargs.pop('connection_string', None)
@@ -240,6 +248,7 @@ def cf_container_client(cli_ctx, kwargs):
 
 def cf_adls_service(cli_ctx, kwargs):
     client_kwargs = _prepare_client_kwargs_track2(cli_ctx)
+    client_kwargs = _config_location_mode(kwargs, client_kwargs)
     t_adls_service = get_sdk(cli_ctx, ResourceType.DATA_STORAGE_FILEDATALAKE,
                              '_data_lake_service_client#DataLakeServiceClient')
     connection_string = kwargs.pop('connection_string', None)
@@ -248,6 +257,10 @@ def cf_adls_service(cli_ctx, kwargs):
     token_credential = kwargs.pop('token_credential', None)
     sas_token = kwargs.pop('sas_token', None)
 
+    location_mode = kwargs.pop('location_mode', None)
+    if location_mode:
+        client_kwargs['_location_mode'] = location_mode
+
     if connection_string:
         return t_adls_service.from_connection_string(conn_str=connection_string, **client_kwargs)
 
@@ -276,6 +289,7 @@ def cf_or_policy(cli_ctx, _):
 
 def cf_queue_service(cli_ctx, kwargs):
     client_kwargs = _prepare_client_kwargs_track2(cli_ctx)
+    client_kwargs = _config_location_mode(kwargs, client_kwargs)
     t_queue_service = get_sdk(cli_ctx, ResourceType.DATA_STORAGE_QUEUE, '_queue_service_client#QueueServiceClient')
     connection_string = kwargs.pop('connection_string', None)
     account_name = kwargs.pop('account_name', None)
diff --git a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_blob_list_scenarios.yaml b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_blob_list_scenarios.yaml
index fa710fec2a0..063a3826c98 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_blob_list_scenarios.yaml
+++ b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_blob_list_scenarios.yaml
@@ -15,7 +15,7 @@ interactions:
       ParameterSetName:
       - -n -g --query -o
       User-Agent:
-      - AZURECLI/2.14.0 azsdk-python-azure-mgmt-storage/16.0.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-azure-mgmt-storage/16.0.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Storage/storageAccounts/storage000002/listKeys?api-version=2019-06-01&$expand=kerb
   response:
@@ -29,7 +29,7 @@ interactions:
       content-type:
       - application/json
       date:
-      - Fri, 06 Nov 2020 10:54:02 GMT
+      - Thu, 21 Jan 2021 09:33:06 GMT
       expires:
       - '-1'
       pragma:
@@ -45,7 +45,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-resource-requests:
-      - '11993'
+      - '11999'
     status:
       code: 200
       message: OK
@@ -57,9 +57,9 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:03 GMT
+      - Thu, 21 Jan 2021 09:33:07 GMT
       x-ms-version:
       - '2018-11-09'
     method: PUT
@@ -71,11 +71,11 @@ interactions:
       content-length:
       - '0'
       date:
-      - Fri, 06 Nov 2020 10:54:11 GMT
+      - Thu, 21 Jan 2021 09:33:08 GMT
       etag:
-      - '"0x8D882424B792B50"'
+      - '"0x8D8BDEF900D6F41"'
       last-modified:
-      - Fri, 06 Nov 2020 10:54:11 GMT
+      - Thu, 21 Jan 2021 09:33:08 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -91,11 +91,11 @@ interactions:
       Content-Length:
       - '131072'
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-blob-type:
       - BlockBlob
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:12 GMT
+      - Thu, 21 Jan 2021 09:33:08 GMT
       x-ms-version:
       - '2018-11-09'
     method: PUT
@@ -109,11 +109,11 @@ interactions:
       content-md5:
       - DfvoqkwgtS4bi/PLbL3xkw==
       date:
-      - Fri, 06 Nov 2020 10:54:19 GMT
+      - Thu, 21 Jan 2021 09:33:10 GMT
       etag:
-      - '"0x8D882424FF706D5"'
+      - '"0x8D8BDEF9199D8E9"'
       last-modified:
-      - Fri, 06 Nov 2020 10:54:19 GMT
+      - Thu, 21 Jan 2021 09:33:11 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-server-encrypted:
@@ -130,12 +130,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:19 GMT
+      - Thu, 21 Jan 2021 09:33:11 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -143,9 +147,9 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:19
-        GMT</Last-Modified><Etag>0x8D882424FF706D5</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:11
+        GMT</Last-Modified><Etag>0x8D8BDEF9199D8E9</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -153,7 +157,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:54:25 GMT
+      - Thu, 21 Jan 2021 09:33:11 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -171,9 +175,9 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:26 GMT
+      - Thu, 21 Jan 2021 09:33:12 GMT
       x-ms-version:
       - '2018-11-09'
     method: PUT
@@ -185,17 +189,17 @@ interactions:
       content-length:
       - '0'
       date:
-      - Fri, 06 Nov 2020 10:54:32 GMT
+      - Thu, 21 Jan 2021 09:33:13 GMT
       etag:
-      - '"0x8D882424FF706D5"'
+      - '"0x8D8BDEF9199D8E9"'
       last-modified:
-      - Fri, 06 Nov 2020 10:54:19 GMT
+      - Thu, 21 Jan 2021 09:33:11 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-server-encrypted:
       - 'false'
       x-ms-snapshot:
-      - '2020-11-06T10:54:32.6011059Z'
+      - '2021-01-21T09:33:13.7846270Z'
       x-ms-version:
       - '2018-11-09'
     status:
@@ -208,12 +212,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --include --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:33 GMT
+      - Thu, 21 Jan 2021 09:33:14 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -221,14 +229,14 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Snapshot>2020-11-06T10:54:32.6011059Z</Snapshot><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:19
-        GMT</Last-Modified><Etag>0x8D882424FF706D5</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Snapshot>2021-01-21T09:33:13.7846270Z</Snapshot><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:11
+        GMT</Last-Modified><Etag>0x8D8BDEF9199D8E9</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:19
-        GMT</Last-Modified><Etag>0x8D882424FF706D5</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        /></Blob><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:11
+        GMT</Last-Modified><Etag>0x8D8BDEF9199D8E9</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -236,7 +244,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:54:39 GMT
+      - Thu, 21 Jan 2021 09:33:15 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -254,9 +262,9 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:40 GMT
+      - Thu, 21 Jan 2021 09:33:15 GMT
       x-ms-meta-test:
       - '1'
       x-ms-version:
@@ -270,11 +278,11 @@ interactions:
       content-length:
       - '0'
       date:
-      - Fri, 06 Nov 2020 10:54:45 GMT
+      - Thu, 21 Jan 2021 09:33:15 GMT
       etag:
-      - '"0x8D882426002446D"'
+      - '"0x8D8BDEF94E1D003"'
       last-modified:
-      - Fri, 06 Nov 2020 10:54:46 GMT
+      - Thu, 21 Jan 2021 09:33:16 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-server-encrypted:
@@ -290,9 +298,9 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:46 GMT
+      - Thu, 21 Jan 2021 09:33:16 GMT
       x-ms-version:
       - '2018-11-09'
     method: GET
@@ -304,11 +312,11 @@ interactions:
       content-length:
       - '0'
       date:
-      - Fri, 06 Nov 2020 10:54:52 GMT
+      - Thu, 21 Jan 2021 09:33:17 GMT
       etag:
-      - '"0x8D882426002446D"'
+      - '"0x8D8BDEF94E1D003"'
       last-modified:
-      - Fri, 06 Nov 2020 10:54:46 GMT
+      - Thu, 21 Jan 2021 09:33:16 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-meta-test:
@@ -325,12 +333,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --include --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:54:53 GMT
+      - Thu, 21 Jan 2021 09:33:18 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -338,9 +350,9 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><Metadata><test>1</test></Metadata><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -348,7 +360,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:54:58 GMT
+      - Thu, 21 Jan 2021 09:33:19 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -366,11 +378,11 @@ interactions:
       Content-Length:
       - '131072'
       User-Agent:
-      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.8; Windows 10) AZURECLI/2.14.0
+      - Azure-Storage/2.0.0-2.0.1 (Python CPython 3.7.4; Windows 10) AZURECLI/2.18.0
       x-ms-blob-type:
       - BlockBlob
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:00 GMT
+      - Thu, 21 Jan 2021 09:33:19 GMT
       x-ms-version:
       - '2018-11-09'
     method: PUT
@@ -384,11 +396,11 @@ interactions:
       content-md5:
       - DfvoqkwgtS4bi/PLbL3xkw==
       date:
-      - Fri, 06 Nov 2020 10:55:07 GMT
+      - Thu, 21 Jan 2021 09:33:21 GMT
       etag:
-      - '"0x8D882426C998BB8"'
+      - '"0x8D8BDEF97E908EA"'
       last-modified:
-      - Fri, 06 Nov 2020 10:55:07 GMT
+      - Thu, 21 Jan 2021 09:33:21 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       x-ms-request-server-encrypted:
@@ -405,12 +417,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:07 GMT
+      - Thu, 21 Jan 2021 09:33:21 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -418,14 +434,14 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:55:07 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:55:07
-        GMT</Last-Modified><Etag>0x8D882426C998BB8</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:21 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:21
+        GMT</Last-Modified><Etag>0x8D8BDEF97E908EA</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -433,7 +449,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:13 GMT
+      - Thu, 21 Jan 2021 09:33:22 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -450,12 +466,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --num-results --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:14 GMT
+      - Thu, 21 Jan 2021 09:33:23 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -463,17 +483,17 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>1</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>1</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob></Blobs><NextMarker>2!96!MDAwMDI4IWRpci9ibG9ia3dqbGx2ZmZscnFicjN3b2I3MjUhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</NextMarker></EnumerationResults>"
+        /></Blob></Blobs><NextMarker>2!96!MDAwMDI4IWRpci9ibG9iemVhN3h5cHd1Y3hoempqeHp2Y2EhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</NextMarker></EnumerationResults>"
     headers:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:20 GMT
+      - Thu, 21 Jan 2021 09:33:24 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -490,12 +510,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --num-results --show-next-marker --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:21 GMT
+      - Thu, 21 Jan 2021 09:33:24 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -503,17 +527,17 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>1</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>1</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob></Blobs><NextMarker>2!96!MDAwMDI4IWRpci9ibG9ia3dqbGx2ZmZscnFicjN3b2I3MjUhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</NextMarker></EnumerationResults>"
+        /></Blob></Blobs><NextMarker>2!96!MDAwMDI4IWRpci9ibG9iemVhN3h5cHd1Y3hoempqeHp2Y2EhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</NextMarker></EnumerationResults>"
     headers:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:27 GMT
+      - Thu, 21 Jan 2021 09:33:25 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -530,22 +554,26 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --marker --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:30 GMT
+      - Thu, 21 Jan 2021 09:33:26 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
-    uri: https://storage000002.blob.core.windows.net/con000003?marker=2%2196%21MDAwMDI4IWRpci9ibG9ia3dqbGx2ZmZscnFicjN3b2I3MjUhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh&maxresults=5000&restype=container&comp=list
+    uri: https://storage000002.blob.core.windows.net/con000003?marker=2%2196%21MDAwMDI4IWRpci9ibG9iemVhN3h5cHd1Y3hoempqeHp2Y2EhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh&maxresults=5000&restype=container&comp=list
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><Marker>2!96!MDAwMDI4IWRpci9ibG9ia3dqbGx2ZmZscnFicjN3b2I3MjUhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</Marker><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:55:07 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:55:07
-        GMT</Last-Modified><Etag>0x8D882426C998BB8</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><Marker>2!96!MDAwMDI4IWRpci9ibG9iemVhN3h5cHd1Y3hoempqeHp2Y2EhMDAwMDI4ITk5OTktMTItMzFUMjM6NTk6NTkuOTk5OTk5OVoh</Marker><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:21 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:21
+        GMT</Last-Modified><Etag>0x8D8BDEF97E908EA</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -553,7 +581,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:35 GMT
+      - Thu, 21 Jan 2021 09:33:26 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -570,12 +598,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --prefix --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:37 GMT
+      - Thu, 21 Jan 2021 09:33:27 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -583,14 +615,14 @@ interactions:
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><Prefix>dir/</Prefix><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><Prefix>dir/</Prefix><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:55:07 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:55:07
-        GMT</Last-Modified><Etag>0x8D882426C998BB8</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:21 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:21
+        GMT</Last-Modified><Etag>0x8D8BDEF97E908EA</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -598,7 +630,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:42 GMT
+      - Thu, 21 Jan 2021 09:33:28 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -615,12 +647,16 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --delimiter --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:43 GMT
+      - Thu, 21 Jan 2021 09:33:28 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
@@ -634,7 +670,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:49 GMT
+      - Thu, 21 Jan 2021 09:33:28 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -651,27 +687,32 @@ interactions:
       - application/xml
       Accept-Encoding:
       - gzip, deflate
+      CommandName:
+      - storage blob list
       Connection:
       - keep-alive
+      ParameterSetName:
+      - -c --account-name --account-key
       User-Agent:
-      - azsdk-python-storage-blob/12.4.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
+      - AZURECLI/2.18.0 azsdk-python-storage-blob/12.4.0 Python/3.7.4 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Fri, 06 Nov 2020 10:55:50 GMT
+      - Thu, 21 Jan 2021 09:33:30 GMT
       x-ms-version:
       - '2019-12-12'
     method: GET
-    uri: https://storage000002.blob.core.windows.net/con000003?maxresults=5000&restype=container&comp=list
+    uri: https://storage000002-secondary.blob.core.windows.net/con000003?maxresults=5000&restype=container&comp=list
   response:
     body:
       string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults
-        ServiceEndpoint=\"https://storage000002.blob.core.windows.net/\" ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:54:19 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:54:46
-        GMT</Last-Modified><Etag>0x8D882426002446D</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        ServiceEndpoint=\"https://storage000002-secondary.blob.core.windows.net/\"
+        ContainerName=\"con000003\"><MaxResults>5000</MaxResults><Blobs><Blob><Name>dir/blob000004</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:11 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:16
+        GMT</Last-Modified><Etag>0x8D8BDEF94E1D003</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
-        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Fri,
-        06 Nov 2020 10:55:07 GMT</Creation-Time><Last-Modified>Fri, 06 Nov 2020 10:55:07
-        GMT</Last-Modified><Etag>0x8D882426C998BB8</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
+        /></Blob><Blob><Name>dir/blob000005</Name><Properties><Creation-Time>Thu,
+        21 Jan 2021 09:33:21 GMT</Creation-Time><Last-Modified>Thu, 21 Jan 2021 09:33:21
+        GMT</Last-Modified><Etag>0x8D8BDEF97E908EA</Etag><Content-Length>131072</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding
         /><Content-Language /><Content-CRC64 /><Content-MD5>DfvoqkwgtS4bi/PLbL3xkw==</Content-MD5><Cache-Control
         /><Content-Disposition /><BlobType>BlockBlob</BlobType><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted></Properties><OrMetadata
         /></Blob></Blobs><NextMarker /></EnumerationResults>"
@@ -679,7 +720,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Fri, 06 Nov 2020 10:55:56 GMT
+      - Thu, 21 Jan 2021 09:33:32 GMT
       server:
       - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding: