diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..c36bc838
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="9d75b3ca-ac54-4f46-9fc4-6612a979d661" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/src/libexec/zmdiaglog" beforeDir="false" afterPath="$PROJECT_DIR$/src/libexec/zmdiaglog" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GoLibraries">
+    <option name="indexEntireGoPath" value="false" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="24U2LOUvFptS5qzZ6cdYSxgO4iF" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="go.format.on.save.advertiser.fired" value="true" />
+    <property name="go.formatter.settings.were.checked" value="true" />
+    <property name="go.import.settings.migrated" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="9d75b3ca-ac54-4f46-9fc4-6612a979d661" name="Changes" comment="" />
+      <created>1643670788265</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1643670788265</updated>
+      <workItem from="1643670789435" duration="91000" />
+      <workItem from="1643670904930" duration="1308000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VgoProject">
+    <integration-enabled>true</integration-enabled>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/libexec/zmdiaglog b/src/libexec/zmdiaglog
index ce50d6f7..3f0b0e91 100644
--- a/src/libexec/zmdiaglog
+++ b/src/libexec/zmdiaglog
@@ -31,7 +31,7 @@ use Digest::MD5;
 use vars qw(
   $VERSION $PID_FILE $DEFAULT_DEST $DLOGDIR $JMAP $JAVA $JINFO $DEFAULT_TIMEOUT
   $HAVE_GCORE $HAVE_PSTACK $HAVE_LSOF $HAVE_DMESG $LOG_FILE $ZMSTAT_CONF
-  $ZMDUMPENV $ZMLOCALCONFIG $ZMPROV $ZMHOSTNAME $SU $HAVE_NETSTAT $HAVE_MYSQL $ZMMYTOP $ZMINNOTOP $HAVE_NETWORK
+  $ZMDUMPENV $ZMLOCALCONFIG $ZMPROV $ZMHOSTNAME $SU $HAVE_NETSTAT $HAVE_MYSQL $ZMMYTOP $ZMINNOTOP $HAVE_NETWORK $MDBSTAT
 );
 
 my $isMac = isMac();
@@ -58,6 +58,7 @@ $PID_FILE                           = '/opt/zimbra/log/zmmailboxd_java.pid';
 $JMAP                               = '/opt/zimbra/common/bin/jmap';
 $JAVA                               = '/opt/zimbra/common/lib/jvm/java/bin/java';
 $JINFO                              = '/opt/zimbra/common/lib/jvm/java/bin/jinfo';
+$MDBSTAT                            = '/opt/zimbra/common/bin/mdb_stat';
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
 $VERSION                            = 0.1;
 $HAVE_GCORE                         = has_cmd('gcore');
@@ -116,6 +117,29 @@ sub get_java_version() {
     $version;
 }
 
+sub is_ldap_server(){
+    my $mdb;
+    my $ldapServiceInstalled = `sudo -i -u zimbra zmprov -l gs $ZMHOSTNAME zimbraServiceEnabled 2> /dev/null`;
+    my $isLDAPServer = 0;
+    # chomp($ldapServiceInstalled);
+    if (index($ldapServiceInstalled, "zimbraServiceEnabled") != -1) {
+        logmsg "This is an LDAP Server. Gathering LDAP diagnostic data.\n";
+        $isLDAPServer = 1;
+    }else{
+        if (index($ldapServiceInstalled, "") != -1) {
+            print "Attempting to identify if this is an LDAP server.\n";
+            $mdb = '/opt/zimbra/data/ldap/mdb/db/data.mdb';
+            if (-e $mdb) {
+                logmsg "This is (or was) an LDAP Server. Gathering LDAP diagnostic data.\n";
+                $isLDAPServer = 1;
+            }
+        }
+    }
+    if ($isLDAPServer){
+        system("bash -c '/opt/zimbra/common/bin/mdb_stat -a -e -f /opt/zimbra/data/ldap/mdb/db' > ldap_mdb_stat.txt 2>&1");
+    }
+}
+
 sub save_heap_info($$$$) {
     my ( $version, $destination, $pid, $timeout ) = @_;
     my $histo_cmd;
@@ -290,6 +314,7 @@ sub remove_data_dir($) {
 
 # "main"
 sub run() {
+
     Getopt::Long::Configure ("bundling");
     my %options = ('t' => $DEFAULT_TIMEOUT);
     my $opt_result =
@@ -544,6 +569,7 @@ sub run() {
             sleep(5);
         }
     }
+    is_ldap_server;
 
     if ($HAVE_LSOF) {
         logmsg "Saving output of LSOF\n";