diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py
index 593a6712ef6e..5d83366f4b8c 100644
--- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py
+++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py
@@ -23,9 +23,6 @@ def main(generate_input, generate_output):
     python_tag = data.get("python_tag")
     package_total = set()
     for input_readme in data["relatedReadmeMdFiles"]:
-        # skip codegen for data-plane temporarily since it is useless now and may block PR
-        if "resource-manager" not in input_readme:
-            continue
         relative_path_readme = str(Path(spec_folder, input_readme))
         _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin")
         if 'resource-manager' in input_readme:
diff --git a/tools/azure-sdk-tools/packaging_tools/auto_package.py b/tools/azure-sdk-tools/packaging_tools/auto_package.py
index a1406adadd25..16ce57d08c19 100644
--- a/tools/azure-sdk-tools/packaging_tools/auto_package.py
+++ b/tools/azure-sdk-tools/packaging_tools/auto_package.py
@@ -22,7 +22,7 @@ def main(generate_input, generate_output):
         # Changelog
         last_version = ["first release"]
         if "azure-mgmt-" in package_name:
-            md_output = change_log_generate(package_name, last_version)
+            md_output = change_log_generate(package_name, last_version, package["tagIsStable"])
         else:
             md_output = "data-plan skip changelog generation temporarily"
         package["changelog"] = {
diff --git a/tools/azure-sdk-tools/packaging_tools/change_log.py b/tools/azure-sdk-tools/packaging_tools/change_log.py
index fbf63d67671d..f5bcbb1030da 100644
--- a/tools/azure-sdk-tools/packaging_tools/change_log.py
+++ b/tools/azure-sdk-tools/packaging_tools/change_log.py
@@ -214,6 +214,7 @@ def get_report_from_parameter(input_parameter, tag_is_stable: bool = False):
             package_name,
             version=version if version not in ["pypi", "latest"] else None,
             last_pypi=version == "pypi",
+            last_pypi_stable=tag_is_stable,
         )
         if not result:
             raise ValueError("Was not able to build a report")
diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py
index 0d61ba9ff60b..94e5df3ec6c7 100644
--- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py
+++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py
@@ -26,6 +26,7 @@ def generate(
     restapi_git_folder,
     autorest_bin=None,
     force_generation=False,
+    python_tag=None,
 ):
 
     sdk_folder = Path(sdk_folder).expanduser()
diff --git a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py
index 8b32da661c94..7da308f2a3d4 100644
--- a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py
+++ b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py
@@ -25,11 +25,6 @@ def main(generate_input, generate_output):
     package_total = set()
 
     input_readme = data["relatedReadmeMdFile"]
-    # skip codegen for data-plane temporarily since it is useless now and may block PR
-    if "resource-manager" not in input_readme:
-        # continue
-        _LOGGER.error(f"[CODEGEN]({input_readme}) 'resource-manager' not in [relatedReadmeMdFile]")
-        return
     relative_path_readme = str(Path(spec_folder, input_readme))
     _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin")