diff --git a/src/extension/src/manifest.xml b/src/extension/src/manifest.xml
index 30120327..cc0ecdce 100644
--- a/src/extension/src/manifest.xml
+++ b/src/extension/src/manifest.xml
@@ -2,7 +2,7 @@
 <ExtensionImage xmlns="http://schemas.microsoft.com/windowsazure">
   <ProviderNameSpace>Microsoft.CPlat.Core</ProviderNameSpace>
   <Type>LinuxPatchExtension</Type>
-  <Version>1.6.4</Version>
+  <Version>1.6.5</Version>
   <Label>Microsoft Azure VM InGuest Patch Extension for Linux Virtual Machines</Label>
   <HostingResources>VmRole</HostingResources>
   <MediaLink></MediaLink>
diff --git a/src/tools/Package-All.py b/src/tools/Package-All.py
index b019971a..5ce9f953 100644
--- a/src/tools/Package-All.py
+++ b/src/tools/Package-All.py
@@ -124,6 +124,8 @@ def generate_compiled_script(source_code_path, merged_file_full_path, merged_fil
                     modules_to_be_merged.append(file_path)
                 elif os.path.basename(file_path) in ('__init__.py'):
                     continue
+                elif os.path.basename(file_path) in ('Constants.py'):
+                    modules_to_be_merged.insert(0, file_path)
                 else:
                     if len(modules_to_be_merged) > 0 and '__main__.py' in modules_to_be_merged[-1]:
                         modules_to_be_merged.insert(-1, file_path)
diff --git a/src/tools/Package-Core.py b/src/tools/Package-Core.py
index 37ba5629..9d9fb84a 100644
--- a/src/tools/Package-Core.py
+++ b/src/tools/Package-Core.py
@@ -120,7 +120,7 @@ def generate_compiled_script(source_code_path, merged_file_full_path, merged_fil
                     modules_to_be_merged.append(file_path)
                 elif os.path.basename(file_path) in ('__init__.py'):
                     continue
-                elif os.path.basename(file_path) in ('base_log_processor.py', 'PackageManager.py'):
+                elif os.path.basename(file_path) in ('PackageManager.py', 'Constants.py'):
                     modules_to_be_merged.insert(0, file_path)
                 else:
                     if len(modules_to_be_merged) > 0 and '__main__.py' in modules_to_be_merged[-1]: