diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4ab1b4b77..911a89452 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -83,7 +83,7 @@ jobs:
       run: |
         make IGNORE_ERRORS=m -C $OMR_TARGET/$OMR_KERNEL/source target/install -j$(nproc) || make IGNORE_ERRORS=m -C $OMR_TARGET/$OMR_KERNEL/source target/install -j1 V=s
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.OMR_TARGET }}
         path: /home/runner/work/omr/${{ matrix.OMR_TARGET }}/${{ matrix.OMR_KERNEL }}/source/bin
diff --git a/https-dns-proxy/files/https-dns-proxy.init b/https-dns-proxy/files/https-dns-proxy.init
index 709999b13..ef0ffc7d2 100755
--- a/https-dns-proxy/files/https-dns-proxy.init
+++ b/https-dns-proxy/files/https-dns-proxy.init
@@ -191,6 +191,7 @@ dnsmasq_create_server_backup() {
 				uci -q del_list "dhcp.${cfg}.server=$i"
 			fi
 		done
+		uci -q del_list "dhcp.${cfg}.server=127.0.0.1#5353"
 	fi
 	return 0
 }
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index cc5431c33..9aa5a2c43 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -966,7 +966,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
 	if [ -n "$OMR_TRACKER_INTERFACE" ]; then
 		uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.lc
 	fi
-	uci -q commit openmptcprouter
+	[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 	#ubus call network reload
 
 	# Set a little sleep after an interface error
@@ -1038,7 +1038,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
 		else
 			uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s")
 		fi
-		uci -q commit openmptcprouter
+		[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 	fi
 	nbserver=0
 	piholeenabled=0
@@ -1053,7 +1053,7 @@ fi
 if [ -n "$OMR_TRACKER_INTERFACE" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]; then
 	if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.state)" != "up" ]; then
 		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up'
-		uci -q commit openmptcprouter
+		[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 	fi
 	exit 0
 fi
@@ -1517,7 +1517,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get openmptcprouter.$OMR_TRAC
 		uci -q commit openmptcprouter
 	else
 		[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Get status and settings for $OMR_TRACKER_INTERFACE... Done"
-		uci -q commit openmptcprouter
+		[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 		if [ "$(pgrep openmptcprouter-vps)" = "" ] && ( [ "$(uci -q get openmptcprouter.settings.apilc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.settings.apilc))) -gt 3600 ] ); then
 			_log "Check API configuration..."
 			/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
@@ -1553,8 +1553,8 @@ fi
 					uci -q set openmptcprouter.settings.master="change"
 				fi
 				if [ "$(uci -q get openmptcprouter.settings.master)" != "dynamic" ]; then
-					uci -q commit network
-					uci -q commit openmptcprouter
+					[ -n "$(uci -q changes network)" ] && uci -q commit network
+					[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 				fi
 				_log "Change master interface from $masterintf ($masterlatency ms) to $OMR_TRACKER_INTERFACE ($OMR_TRACKER_LATENCY ms)"
 			fi
@@ -1671,7 +1671,7 @@ set_get_config() {
 if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]; then
 	config_load openmptcprouter
 	config_foreach set_get_config server
-	uci -q commit openmptcprouter
+	[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 fi
 
 if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
@@ -1682,13 +1682,13 @@ fi
 if [ "$(uci -q get glorytun.vpn.enable)" = "1" ] && [ "$(uci -q get glorytun.vpn.key)" = "" ]; then
 	config_load openmptcprouter
 	config_foreach set_get_config server
-	uci -q commit openmptcprouter
+	[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 fi
 
 if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ "$(uci -q get v2ray.omrout.s_vless_user_id)" = "" ]; then
 	config_load openmptcprouter
 	config_foreach set_get_config server
-	uci -q commit openmptcprouter
+	[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
 fi
 
 if [ -n "$(logread | tail -n 2 | grep 'Ring expansion failed')" ]; then