diff --git a/debian/postinst b/debian/postinst
index 14b1fc083..aa20fd381 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -45,6 +45,9 @@ configure)
 	systemctl disable motd-news.service
 	systemctl disable motd-news.timer
 
+	# Disable multipathd service by default. It will be enabled if the iSCSI initiator feature is used
+  systemctl disable multipathd.service
+
 	#
 	# Various tools generate mail on the system, e.g. cron, and we don't
 	# want those to be sent externally via SMTP (or equivalent). Thus,
diff --git a/debian/rules b/debian/rules
index 88d173b80..43a736953 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ DEPENDS += ansible, \
 	   lsb-release, \
 	   makedumpfile, \
 	   mount, \
+	   multipath-tools, \
 	   net-tools, \
 	   netbase, \
 	   netplan.io, \
diff --git a/files/common/usr/bin/get-appliance-version b/files/common/usr/bin/get-appliance-version
index 8387cab05..ace05e2ab 100755
--- a/files/common/usr/bin/get-appliance-version
+++ b/files/common/usr/bin/get-appliance-version
@@ -48,7 +48,7 @@ if [[ $# -gt 2 ]]; then
 fi
 
 if [[ $# -eq 1 ]]; then
-	echo "$output" | tr -d '\n'
+	echo "$output" | tr -d '\n' | sed 's/$/-AES-256/'
 	shift
 fi
 
diff --git a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
index 67abf0d98..47a75d187 100644
--- a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
+++ b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
@@ -515,7 +515,9 @@
 # MAKEDUMP_ARGS - Configure makedumpfile to:
 #       [1] Compress the dump (-c)
 #       [2] Filter out pages that are zero, in the page or private cache,
-#           part of user data, or marked as freed (-d 31)
+#           or marked as freed (-d 23)
+#           Note that we do not exclude the "user data" pages, as these
+#           are needed for drgn to be able to load zfs module symbols
 #       [3] Output a progress indicator, common and error messages, and
 #           a report summary message (--message-level 23)
 #       [4] Exclude ZFS ARC file data pages
@@ -558,7 +560,7 @@
     line: "{{ item.line }}"
   with_items:
     - regex: '^#?MAKEDUMP_ARGS='
-      line: 'MAKEDUMP_ARGS="-c -d 31 --message-level 23 --private-page-filter 0x2F5ABDF11ECAC4E"'
+      line: 'MAKEDUMP_ARGS="-c -d 23 --message-level 23 --private-page-filter 0x2F5ABDF11ECAC4E"'
     - regex: '^#?KDUMP_CMDLINE_APPEND='
       line: 'KDUMP_CMDLINE_APPEND="reset_devices systemd.unit=kdump-tools-dump.service nr_cpus=1 irqpoll nousb ata_piix.prefer_ms_hyperv=0 panic=10"'
 
diff --git a/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh b/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh
index fa44e533b..d8f4b03d7 100755
--- a/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh
+++ b/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh
@@ -9,10 +9,6 @@ die() {
 	exit 1
 }
 
-# Do nothing if Secure Boot is already enabled.
-sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* | awk '{print $NF}')
-[[ $sb -eq 1 ]] && exit 0
-
 #
 # Run only on AWS.
 #
@@ -27,6 +23,10 @@ fi
 
 [[ -d /sys/firmware/efi/efivars ]] || die "Not booted in UEFI mode (/sys/firmware/efi/efivars missing)."
 
+# Do nothing if Secure Boot is already enabled.
+sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* | awk '{print $NF}')
+[[ $sb -eq 1 ]] && exit 0
+
 # Ensure efivars is mounted (usually is on Ubuntu)
 if ! mountpoint -q /sys/firmware/efi/efivars; then
 	log "Mounting efivarfs..."