diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index 3119d93f0..59efc4eec 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -23,6 +23,16 @@ return L.view.extend({
 
 		m = new form.Map('omr-bypass', _('OMR-Bypass'),_('OpenMPTCProuter IP must be used as DNS.'));
 
+		/*
+		s = m.section(form.TypedSection, 'global', _('Global settings'));
+		s.addremove = false;
+		s.anonymous = true;
+
+		o = s.option(form.Flag, 'noipv6', _('Disable IPv6 AAAA DNS results for bypassed domains'));
+		o.default = o.disabled;
+		o.optional = true;
+		*/
+		
 		s = m.section(form.GridSection, 'domains', _('Domains'));
 		s.addremove = true;
 		s.anonymous = true;
@@ -42,6 +52,17 @@ return L.view.extend({
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
 
+		o = s.option(form.ListValue, 'family', _('Restrict to address family'));
+		o.value('ipv4ipv6', _('IPv4 and IPv6'));
+		o.value('ipv4', _('IPv4 only'));
+		o.value('ipv4', _('IPv6 only'));
+		o.default = 'ipv4ipv6';
+		o.modalonly = true
+
+		o = s.option(form.Flag, 'noipv6', _('Disable AAAA IPv6 DNS'));
+		o.default = o.enabled;
+		o.modalonly = true
+
 		s = m.section(form.GridSection, 'ips', _('IPs and Networks'));
 		s.addremove = true;
 		s.anonymous = true;
@@ -223,12 +244,24 @@ return L.view.extend({
 		o.noinactive = true;
 		o.nocreate    = true;
 
-		o = s.option(form.Flag, 'ndpi', _('Enable ndpi'));
-		o.default = o.enabled;
-
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
 
+		o = s.option(form.ListValue, 'family', _('Restrict to address family'));
+		o.value('ipv4ipv6', _('IPv4 and IPv6'));
+		o.value('ipv4', _('IPv4 only'));
+		o.value('ipv4', _('IPv6 only'));
+		o.default = 'ipv4ipv6';
+		o.modalonly = true
+
+		o = s.option(form.Flag, 'noipv6', _('Disable AAAA IPv6 DNS'));
+		o.default = o.enabled;
+		o.modalonly = true
+
+		o = s.option(form.Flag, 'ndpi', _('Enable ndpi'));
+		o.default = o.enabled;
+		o.modalonly = true
+
 		return m.render();
 	}
 });
diff --git a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
index 9ced39f93..394829cc0 100755
--- a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
+++ b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
@@ -118,6 +118,13 @@ if [ "$(uci -q get omr-bypass.amazonvideo)" = "" ]; then
 		commit omr-bypass
 	EOF
 fi
+#if [ "$(uci -q get omr-bypass.global)" = "" ]; then
+#	uci -q batch <<-EOF >/dev/null
+#		set omr-bypass.global=global
+#		set omr-bypass.global.noipv6='0'
+#		commit omr-bypass
+#	EOF
+#fi
 if [ ! -f /etc/crontabs/root ] || [ "$(cat /etc/crontabs/root | grep bypass)" = "" ]; then
 	echo "0 2 * * * /etc/init.d/omr-bypass bypass_asn" >> /etc/crontabs/root
 fi
diff --git a/mptcp/files/etc/hotplug.d/iface/30-mptcp b/mptcp/files/etc/hotplug.d/iface/30-mptcp
index c37447553..6363894b0 100644
--- a/mptcp/files/etc/hotplug.d/iface/30-mptcp
+++ b/mptcp/files/etc/hotplug.d/iface/30-mptcp
@@ -1,11 +1,12 @@
 #!/bin/sh
-
-[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
+[ "$ACTION" = ifup -o "$ACTION" = ifupdate -o "$ACTION" = ifdown -o "$ACTION" = iflink ] || exit 0
 [ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" -a -z "$IFUPDATE_DATA" ] && exit 0
 
+
 /etc/init.d/mptcp enabled || exit 0
 
-if [ -z "$(echo $DEVICE | grep oip | grep gre)" ]; then
+
+if [ "$ACTION" = ifup -o "$ACTION" = ifupdate -o "$ACTION" = iflink ] && [ -z "$(echo $DEVICE | grep oip | grep gre)" ]; then
 	logger -t "mptcp" "Reloading mptcp config due to $ACTION of $INTERFACE ($DEVICE)"
 	/etc/init.d/mptcp reload "$DEVICE" >/dev/null || exit 0
 else
diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 2f55b85c7..a91cdaaf7 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -49,7 +49,12 @@ MAKE_FLAGS += \
     KERNEL_DIR="$(LINUX_DIR)" \
     MODULES_DIR="$(TARGET_MODULES_DIR)" \
     NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter \
-    ARCH="$(LINUX_KARCH)"
+
+ifeq ($ARCH),aarch64)
+    MAKE_FLAGS += ARCH="arm64"
+else
+    MAKE_FLAGS += ARCH="$(LINUX_KARCH)"
+endif
 
 define Build/Compile
 	(cd $(PKG_BUILD_DIR)/src/lib &&\