diff --git a/bin/zafl.sh b/bin/zafl.sh
index 6d0cc57ba021bd3cb10731349db5a1af59f69eab..f6e65709c46c84ce1dd2f73f7532ca4294e43cd6 100755
--- a/bin/zafl.sh
+++ b/bin/zafl.sh
@@ -32,6 +32,7 @@ usage()
 	echo "     -c, --enable-breakup-critical-edges     Breakup critical edges"
 	echo "     -C, --disable-breakup-critical-edges    Do not breakup critical edges (default)"
 	echo "     -f, --fork-server-only                  Fork server only"
+	echo "     -F, --disable-fork-server               No fork server"
 	echo "     -m, --enable-fixed-map [<address>]      Use fixed address for tracing map (<address> must be hex and page-aligned, e.g., 0x10000)"
 	echo "     -M, --disable-fixed-map                 Disable fixed address tracing map"
 	echo "     -i, --enable-floating-instrumentation   Select best instrumentation point within basic block (default)"
@@ -187,6 +188,10 @@ parse_args()
 				log_warning "Fork Server Only mode: no block-level instrumentation will be performed"
 				shift
 				;;
+			-F | --disable-fork-server)
+				zax_opt=" $zax_opt -o zax:\"-F\" "
+				shift
+				;;
 			-m | --enable-fixed-map)
 				shift
 				case $1 in
diff --git a/move_globals b/move_globals
index 34db6e6f2dc8397bc2af64fa8325366907c1dd90..a72ca2375278c6a68682d6975de3d889be14c734 160000
--- a/move_globals
+++ b/move_globals
@@ -1 +1 @@
-Subproject commit 34db6e6f2dc8397bc2af64fa8325366907c1dd90
+Subproject commit a72ca2375278c6a68682d6975de3d889be14c734
diff --git a/zipr_umbrella b/zipr_umbrella
index 6ad3ad5693a626b35fc20c5090adc523d69384d7..3a2c0d31167517bbdcca3596863f36cd1dbb7922 160000
--- a/zipr_umbrella
+++ b/zipr_umbrella
@@ -1 +1 @@
-Subproject commit 6ad3ad5693a626b35fc20c5090adc523d69384d7
+Subproject commit 3a2c0d31167517bbdcca3596863f36cd1dbb7922