diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
index 1323a894d60a..e8a457ca9e65 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_azure_appconfiguration_client.py
@@ -37,7 +37,14 @@
 )
 from ._sync_token import SyncTokenPolicy
 from ._user_agent import USER_AGENT
+try:
+    from typing import TYPE_CHECKING
+except ImportError:
+    TYPE_CHECKING = False
 
+if TYPE_CHECKING:
+    # pylint:disable=unused-import,ungrouped-imports
+    from typing import Any, Optional
 
 class AzureAppConfigurationClient:
     """Represents an client that calls restful API of Azure App Configuration service.
@@ -54,7 +61,7 @@ class AzureAppConfigurationClient:
     # pylint:disable=protected-access
 
     def __init__(self, base_url, credential, **kwargs):
-        # type: (str, any, dict) -> None
+        # type: (str, Any, dict) -> None
         try:
             if not base_url.lower().startswith('http'):
                 base_url = "https://" + base_url
@@ -89,7 +96,7 @@ def from_connection_string(
         connection_string,
         **kwargs
     ):
-        # type: (string, dict) -> AzureAppConfigurationClient
+        # type: (str, dict) -> AzureAppConfigurationClient
         """Create AzureAppConfigurationClient from a Connection String.
 
                 :param connection_string: Connection String
diff --git a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
index fcc586176ffb..937a9c034c70 100644
--- a/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
+++ b/sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/aio/_azure_configuration_client_async.py
@@ -38,6 +38,14 @@
 from .._models import ConfigurationSetting
 from .._sync_token import SyncTokenPolicy
 from .._user_agent import USER_AGENT
+try:
+    from typing import TYPE_CHECKING
+except ImportError:
+    TYPE_CHECKING = False
+
+if TYPE_CHECKING:
+    # pylint:disable=unused-import,ungrouped-imports
+    from typing import Any, Optional
 
 
 class AzureAppConfigurationClient:
@@ -57,7 +65,7 @@ class AzureAppConfigurationClient:
     # pylint:disable=protected-access
 
     def __init__(self, base_url, credential, **kwargs):
-        # type: (str, any, dict) -> None
+        # type: (str, Any, dict) -> None
         try:
             if not base_url.lower().startswith('http'):
                 base_url = "https://" + base_url
@@ -93,7 +101,7 @@ def from_connection_string(
         connection_string,
         **kwargs
     ):
-        # type: (string, dict) -> AzureAppConfigurationClient
+        # type: (str, dict) -> AzureAppConfigurationClient
         """Create AzureAppConfigurationClient from a Connection String.
 
                 :param connection_string: Connection String
diff --git a/sdk/appconfiguration/azure-appconfiguration/setup.py b/sdk/appconfiguration/azure-appconfiguration/setup.py
index 421ed2a3099f..2560fc9489f7 100644
--- a/sdk/appconfiguration/azure-appconfiguration/setup.py
+++ b/sdk/appconfiguration/azure-appconfiguration/setup.py
@@ -73,7 +73,7 @@
     author_email='azpysdkhelp@microsoft.com',
     url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',