diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake
index 57262e10d7d..20b139cf5d1 100644
--- a/win/packaging/create_msi.cmake
+++ b/win/packaging/create_msi.cmake
@@ -357,6 +357,11 @@ SET(CPACK_WIX_INCLUDES
 )
 ENDFOREACH()
 
+LIST(LENGTH WIX_FEATURE_AlwaysInstall_COMPONENTS len)
+IF (len LESS_EQUAL 0)
+ MESSAGE(FATAL_ERROR "AlwaysInstall_COMPONENTS is empty")
+ENDIF()
+LIST(JOIN WIX_FEATURE_AlwaysInstall_COMPONENTS "," MANDATORY_FEATURES)
 
 CONFIGURE_FILE(${SRCDIR}/mysql_server.wxs.in
  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 056a7ec43ab..584f1e6921b 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -63,6 +63,21 @@
     <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec"  Execute="immediate" Return="check" Impersonate="yes" />
 
 
+    <!--
+    When msiexec /i ADDLOCAL=<feature_list> is used, usually only features in
+    the <feature_list> are installed. owever there are things we always want to
+    be there, there is ALWAYSINSTALL feature id, hidden in UI for that.
+    Modify ADDLOCAL list by adding mandatory features.
+    -->
+    <CustomAction Id="ForceAddMandatoryFeatures"
+              Property="ADDLOCAL"
+              Value="[ADDLOCAL],@MANDATORY_FEATURES@"/>
+    <InstallUISequence>
+      <Custom Action="ForceAddMandatoryFeatures" Before="CostFinalize">ADDLOCAL</Custom>
+    </InstallUISequence>
+    <InstallExecuteSequence>
+      <Custom Action="ForceAddMandatoryFeatures" Before="CostFinalize">ADDLOCAL</Custom>
+    </InstallExecuteSequence>
 
     <!-- 
       User interface dialogs