diff --git a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml
index 63f0951e6a3c..65322fc8f69b 100644
--- a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml
+++ b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml
@@ -4,3 +4,4 @@ package_pprint_name = "Application Insights"
 package_doc_id = ""
 is_stable = false
 is_arn = false
+auto_update = false
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt b/sdk/appplatform/azure-mgmt-appplatform/LICENSE.txt
similarity index 100%
rename from tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt
rename to sdk/appplatform/azure-mgmt-appplatform/LICENSE.txt
diff --git a/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in b/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in
index 3a9b6517412b..ceca2422f05f 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in
+++ b/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in
@@ -1,6 +1,5 @@
-include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/appplatform/azure-mgmt-appplatform/README.md b/sdk/appplatform/azure-mgmt-appplatform/README.md
index 8fee55c5c6cc..76432cf53950 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/README.md
+++ b/sdk/appplatform/azure-mgmt-appplatform/README.md
@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Appplatform Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
@@ -11,9 +11,9 @@ For a more complete view of Azure libraries, see the [azure sdk python release](
 To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
 
 
-
+ 
 For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
-Code samples for this package can be found at [AppPlatform Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
+Code samples for this package can be found at [Appplatform Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
 Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
@@ -21,7 +21,7 @@ Additional code samples for different Azure services are available at [Samples R
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-appplatform%2FREADME.png)
diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/__init__.py b/sdk/appplatform/azure-mgmt-appplatform/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/azure/__init__.py
+++ b/sdk/appplatform/azure-mgmt-appplatform/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/__init__.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/__init__.py
+++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml
index 1d7edd47be33..f2b6c449b94d 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml
+++ b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml
@@ -5,4 +5,3 @@ package_pprint_name = "Appplatform Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
diff --git a/sdk/appplatform/azure-mgmt-appplatform/setup.py b/sdk/appplatform/azure-mgmt-appplatform/setup.py
index 008426455bb3..faf225120737 100644
--- a/sdk/appplatform/azure-mgmt-appplatform/setup.py
+++ b/sdk/appplatform/azure-mgmt-appplatform/setup.py
@@ -36,7 +36,7 @@
     pass
 
 # Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, 'version.py') 
+with open(os.path.join(package_folder_path, 'version.py')
           if os.path.exists(os.path.join(package_folder_path, 'version.py'))
           else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -66,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -81,8 +81,8 @@
     ]),
     install_requires=[
         'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/sdk/attestation/azure-mgmt-attestation/LICENSE.txt b/sdk/attestation/azure-mgmt-attestation/LICENSE.txt
new file mode 100644
index 000000000000..2d3163745319
--- /dev/null
+++ b/sdk/attestation/azure-mgmt-attestation/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/attestation/azure-mgmt-attestation/MANIFEST.in b/sdk/attestation/azure-mgmt-attestation/MANIFEST.in
index a3cb07df8765..ceca2422f05f 100644
--- a/sdk/attestation/azure-mgmt-attestation/MANIFEST.in
+++ b/sdk/attestation/azure-mgmt-attestation/MANIFEST.in
@@ -2,4 +2,4 @@ recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/attestation/azure-mgmt-attestation/README.md b/sdk/attestation/azure-mgmt-attestation/README.md
index 3226a465d527..188dea142651 100644
--- a/sdk/attestation/azure-mgmt-attestation/README.md
+++ b/sdk/attestation/azure-mgmt-attestation/README.md
@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure MyService Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
@@ -11,9 +11,9 @@ For a more complete view of Azure libraries, see the [azure sdk python release](
 To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
 
 
-
+ 
 For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
-Code samples for this package can be found at [Attestation Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
+Code samples for this package can be found at [MyService Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
 Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
@@ -21,7 +21,7 @@ Additional code samples for different Azure services are available at [Samples R
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-attestation%2FREADME.png)
diff --git a/sdk/attestation/azure-mgmt-attestation/azure/__init__.py b/sdk/attestation/azure-mgmt-attestation/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/attestation/azure-mgmt-attestation/azure/__init__.py
+++ b/sdk/attestation/azure-mgmt-attestation/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/attestation/azure-mgmt-attestation/azure/mgmt/__init__.py b/sdk/attestation/azure-mgmt-attestation/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/attestation/azure-mgmt-attestation/azure/mgmt/__init__.py
+++ b/sdk/attestation/azure-mgmt-attestation/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml
index 00288928243d..0636d04fc345 100644
--- a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml
+++ b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml
@@ -5,4 +5,3 @@ package_pprint_name = "MyService Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
diff --git a/sdk/attestation/azure-mgmt-attestation/setup.py b/sdk/attestation/azure-mgmt-attestation/setup.py
index d04b35001be8..492bdc949088 100644
--- a/sdk/attestation/azure-mgmt-attestation/setup.py
+++ b/sdk/attestation/azure-mgmt-attestation/setup.py
@@ -36,7 +36,9 @@
     pass
 
 # Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd:
+with open(os.path.join(package_folder_path, 'version.py')
+          if os.path.exists(os.path.join(package_folder_path, 'version.py'))
+          else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
@@ -64,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -78,9 +80,9 @@
         'azure.mgmt',
     ]),
     install_requires=[
-        'msrest>=0.5.0',
+        'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/sdk/automanage/azure-mgmt-automanage/LICENSE.txt b/sdk/automanage/azure-mgmt-automanage/LICENSE.txt
new file mode 100644
index 000000000000..2d3163745319
--- /dev/null
+++ b/sdk/automanage/azure-mgmt-automanage/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/automanage/azure-mgmt-automanage/MANIFEST.in b/sdk/automanage/azure-mgmt-automanage/MANIFEST.in
index a3cb07df8765..ceca2422f05f 100644
--- a/sdk/automanage/azure-mgmt-automanage/MANIFEST.in
+++ b/sdk/automanage/azure-mgmt-automanage/MANIFEST.in
@@ -2,4 +2,4 @@ recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/automanage/azure-mgmt-automanage/README.md b/sdk/automanage/azure-mgmt-automanage/README.md
index b7d922c6650f..8f72e71226e3 100644
--- a/sdk/automanage/azure-mgmt-automanage/README.md
+++ b/sdk/automanage/azure-mgmt-automanage/README.md
@@ -1,21 +1,27 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Auto Manage Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
 # Usage
 
-For code examples, see [Auto Manage Management](https://docs.microsoft.com/python/api/overview/azure/)
-on docs.microsoft.com.
+
+To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
+
+
+ 
+For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
+Code samples for this package can be found at [Auto Manage Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
+Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
 # Provide Feedback
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-automanage%2FREADME.png)
diff --git a/sdk/automanage/azure-mgmt-automanage/azure/__init__.py b/sdk/automanage/azure-mgmt-automanage/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/automanage/azure-mgmt-automanage/azure/__init__.py
+++ b/sdk/automanage/azure-mgmt-automanage/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/automanage/azure-mgmt-automanage/azure/mgmt/__init__.py b/sdk/automanage/azure-mgmt-automanage/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/automanage/azure-mgmt-automanage/azure/mgmt/__init__.py
+++ b/sdk/automanage/azure-mgmt-automanage/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml
index 0cbc63c7cc85..cdedb80cf597 100644
--- a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml
+++ b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml
@@ -5,4 +5,3 @@ package_pprint_name = "Auto Manage Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
diff --git a/sdk/automanage/azure-mgmt-automanage/setup.py b/sdk/automanage/azure-mgmt-automanage/setup.py
index 53b8251ba353..a2cdf9cf737d 100644
--- a/sdk/automanage/azure-mgmt-automanage/setup.py
+++ b/sdk/automanage/azure-mgmt-automanage/setup.py
@@ -66,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -80,9 +80,9 @@
         'azure.mgmt',
     ]),
     install_requires=[
-        'msrest>=0.5.0',
+        'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/LICENSE.txt b/sdk/azureadb2c/azure-mgmt-azureadb2c/LICENSE.txt
new file mode 100644
index 000000000000..2d3163745319
--- /dev/null
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/MANIFEST.in b/sdk/azureadb2c/azure-mgmt-azureadb2c/MANIFEST.in
index a3cb07df8765..ceca2422f05f 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/MANIFEST.in
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/MANIFEST.in
@@ -2,4 +2,4 @@ recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/README.md b/sdk/azureadb2c/azure-mgmt-azureadb2c/README.md
index de064ba17dc4..fa2575b1db48 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/README.md
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/README.md
@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Azureadb2c Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
@@ -21,7 +21,7 @@ Additional code samples for different Azure services are available at [Samples R
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-workloadmonitor%2FREADME.png)
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-azureadb2c%2FREADME.png)
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/__init__.py b/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/__init__.py
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/mgmt/__init__.py b/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/mgmt/__init__.py
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml
index 9dc8ef5f830b..ab0abb5acbaa 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml
@@ -5,4 +5,3 @@ package_pprint_name = "Azureadb2c Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/setup.py b/sdk/azureadb2c/azure-mgmt-azureadb2c/setup.py
index 88ae2a3b73e3..1ca9d7ed6c87 100644
--- a/sdk/azureadb2c/azure-mgmt-azureadb2c/setup.py
+++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/setup.py
@@ -66,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -80,9 +80,9 @@
         'azure.mgmt',
     ]),
     install_requires=[
-        'msrest>=0.5.0',
+        'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0'
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/LICENSE.txt b/sdk/azurestackhci/azure-mgmt-azurestackhci/LICENSE.txt
new file mode 100644
index 000000000000..2d3163745319
--- /dev/null
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/MANIFEST.in b/sdk/azurestackhci/azure-mgmt-azurestackhci/MANIFEST.in
index 3a9b6517412b..ceca2422f05f 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/MANIFEST.in
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/MANIFEST.in
@@ -1,6 +1,5 @@
-include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/README.md b/sdk/azurestackhci/azure-mgmt-azurestackhci/README.md
index 046c8511f7dc..241c932f792f 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/README.md
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/README.md
@@ -1,7 +1,7 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure AzureStackHCI Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
@@ -11,9 +11,9 @@ For a more complete view of Azure libraries, see the [azure sdk python release](
 To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
 
 
-
+ 
 For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
-Code samples for this package can be found at [Azure Stack HCI Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
+Code samples for this package can be found at [AzureStackHCI Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
 Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
@@ -21,7 +21,7 @@ Additional code samples for different Azure services are available at [Samples R
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-azurestackhci%2FREADME.png)
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/__init__.py b/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/__init__.py
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/mgmt/__init__.py b/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/mgmt/__init__.py
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml
index a4878bb809c5..80466016f666 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml
@@ -5,4 +5,3 @@ package_pprint_name = "AzureStackHCI Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/setup.py b/sdk/azurestackhci/azure-mgmt-azurestackhci/setup.py
index c0f551efc68b..cfb45be6ae85 100644
--- a/sdk/azurestackhci/azure-mgmt-azurestackhci/setup.py
+++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/setup.py
@@ -36,7 +36,7 @@
     pass
 
 # Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, 'version.py') 
+with open(os.path.join(package_folder_path, 'version.py')
           if os.path.exists(os.path.join(package_folder_path, 'version.py'))
           else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -66,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -81,8 +81,8 @@
     ]),
     install_requires=[
         'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/LICENSE.txt b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/LICENSE.txt
new file mode 100644
index 000000000000..2d3163745319
--- /dev/null
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/MANIFEST.in b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/MANIFEST.in
index 3a9b6517412b..ceca2422f05f 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/MANIFEST.in
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/MANIFEST.in
@@ -1,6 +1,5 @@
-include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py
 include azure/mgmt/__init__.py
-
+include LICENSE.txt
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/README.md b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/README.md
index 0f477e56b22b..5a1870c17aad 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/README.md
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/README.md
@@ -1,21 +1,27 @@
 # Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Baremetalinfrastructure Management Client Library.
-This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+This package has been tested with Python 2.7, 3.6+.
 For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
 
 
 # Usage
 
-For code examples, see [Baremetalinfrastructure Management](https://docs.microsoft.com/python/api/overview/azure/)
-on docs.microsoft.com.
+
+To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
+
+
+ 
+For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
+Code samples for this package can be found at [Baremetalinfrastructure Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
+Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
 # Provide Feedback
 
 If you encounter any bugs or have suggestions, please file an issue in the
 [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
-section of the project.
+section of the project. 
 
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-baremetalinfrastructure%2FREADME.png)
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/__init__.py b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/__init__.py
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/mgmt/__init__.py b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/mgmt/__init__.py
index 0260537a02bb..8db66d3d0f0f 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/mgmt/__init__.py
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/azure/mgmt/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml
index 9d80c14d060f..bcb8422d76f8 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml
@@ -5,5 +5,3 @@ package_pprint_name = "Baremetalinfrastructure Management"
 package_doc_id = ""
 is_stable = false
 is_arm = true
-need_msrestazure = true
-need_azuremgmtcore = true
diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/setup.py b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/setup.py
index 37623dd0f087..85239338f264 100644
--- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/setup.py
+++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/setup.py
@@ -66,10 +66,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
@@ -81,8 +81,8 @@
     ]),
     install_requires=[
         'msrest>=0.6.21',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
-        'azure-mgmt-core>=1.2.0,<2.0.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-mgmt-nspkg'],
diff --git a/tools/azure-sdk-tools/packaging_tools/__init__.py b/tools/azure-sdk-tools/packaging_tools/__init__.py
index 67e29e69bb70..1b6afe958dc6 100644
--- a/tools/azure-sdk-tools/packaging_tools/__init__.py
+++ b/tools/azure-sdk-tools/packaging_tools/__init__.py
@@ -29,7 +29,10 @@ def build_config(config: Dict[str, Any]) -> Dict[str, str]:
     result["is_arm"] = result.pop("is_arm", True)
 
     # Do I need msrestazure for this package?
-    result["need_msrestazure"] = result.pop("need_msrestazure", True)
+    result["need_msrestazure"] = result.pop("need_msrestazure", False)
+
+    # Do I need azure-mgmt-core for this package?
+    result["need_azuremgmtcore"] = result.pop("need_azuremgmtcore", True)
 
     # Pre-compute some Jinja variable that are complicated to do inside the templates
     package_parts = result["package_nspkg"][: -len("-nspkg")].split("-")
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE
new file mode 100644
index 000000000000..b2f52a2bad4e
--- /dev/null
+++ b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) Microsoft Corporation.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
index b67a47a42802..597108650d29 100644
--- a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
+++ b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in
@@ -3,4 +3,4 @@ include *.md
 {%- for init_name in init_names %}
 include {{ init_name }}
 {%- endfor %}
-include LICENSE.txt
+include LICENSE
diff --git a/tools/azure-sdk-tools/packaging_tools/templates/setup.py b/tools/azure-sdk-tools/packaging_tools/templates/setup.py
index 40f72f8b053b..b7ec98cb4e9d 100644
--- a/tools/azure-sdk-tools/packaging_tools/templates/setup.py
+++ b/tools/azure-sdk-tools/packaging_tools/templates/setup.py
@@ -70,6 +70,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,