diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template
index 9f24c4d5..e97e0ec2 100644
--- a/docker/Dockerfile.template
+++ b/docker/Dockerfile.template
@@ -24,7 +24,7 @@ ENV SHELL=/bin/bash \
 
 RUN apt update --yes && \
     apt install --yes --no-install-recommends --no-install-suggests \
-      ca-certificates nano curl bc kmod git \
+      ca-certificates nano curl bc kmod git gettext texinfo autopoint \
       build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh
index 4e12f31c..0a28be3b 100755
--- a/files/board/arpl/overlayfs/opt/arpl/init.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/init.sh
@@ -72,10 +72,10 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
   # Initialize with real MAC
-  writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
 fi
+writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
 
 # Set custom MAC if defined
 MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
index 494f0d1c..a3ca71f8 100755
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -367,7 +367,7 @@ function cmdlineMenu() {
           dialog --backtitle "`backtitle`" --title "User cmdline" \
             --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
             2>${TMP_PATH}/resp
-          [ $? -ne 0 ] && continue
+          [ $? -ne 0 ] && break
           MAC="`<"${TMP_PATH}/resp"`"
           [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
           MAC1="`echo "${MAC}" | sed 's/://g'`"
diff --git a/files/board/arpl/p3/addons/dbgutils/all.tgz b/files/board/arpl/p3/addons/dbgutils/all.tgz
new file mode 100644
index 00000000..416bdd3a
Binary files /dev/null and b/files/board/arpl/p3/addons/dbgutils/all.tgz differ
diff --git a/files/board/arpl/p3/addons/dbgutils/manifest.yml b/files/board/arpl/p3/addons/dbgutils/manifest.yml
new file mode 100644
index 00000000..255357be
--- /dev/null
+++ b/files/board/arpl/p3/addons/dbgutils/manifest.yml
@@ -0,0 +1,14 @@
+version: 1
+name: dbgutils
+description: "Binaries to facilitate debug in the junior mode"
+all:
+  install-script: "install.sh"
+  copy: "all"
+available-for:
+  bromolow-3.10.108:
+  apollolake-4.4.180:
+  broadwell-4.4.180:
+  broadwellnk-4.4.180:
+  denverton-4.4.180:
+  geminilake-4.4.180:
+  v1000-4.4.180:
diff --git a/files/board/arpl/p3/addons/maxdisks/all.tgz b/files/board/arpl/p3/addons/maxdisks/all.tgz
index 56e635a9..a3b2832a 100644
Binary files a/files/board/arpl/p3/addons/maxdisks/all.tgz and b/files/board/arpl/p3/addons/maxdisks/all.tgz differ
diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz
index 7b361ca8..7fdb8aa5 100644
Binary files a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz and b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz
index d0881a06..bc33d452 100644
Binary files a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz
index 5d32fd6c..acfe119a 100644
Binary files a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz
index 68d195f4..f3cad3ee 100644
Binary files a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz and b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz differ
diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz
index f5c816b3..76d90b52 100644
Binary files a/files/board/arpl/p3/modules/denverton-4.4.180.tgz and b/files/board/arpl/p3/modules/denverton-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz
index ec1fee36..1cc7eadd 100644
Binary files a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz and b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz differ
diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz
index fb0645a5..66b4ed1e 100644
Binary files a/files/board/arpl/p3/modules/v1000-4.4.180.tgz and b/files/board/arpl/p3/modules/v1000-4.4.180.tgz differ