diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 545b24ea..5e6cf0a0 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index ac2c7fe3..a6b4f417 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index 89559918..e51198d8 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index 331de751..cadacb6b 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index f0861f09..e41db275 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;
diff --git a/backup-email.rsc b/backup-email.rsc
index da2ee02d..632d2e60 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;
diff --git a/backup-partition.rsc b/backup-partition.rsc
index f99a66c1..c2221d2c 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPartitionCopyBeforeFeatureUpdate;
diff --git a/backup-upload.rsc b/backup-upload.rsc
index 9373b4c1..11ced4ca 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index ee826386..cab1e4c3 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 91a9167c..ea411201 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index cb6cb6f4..a8103569 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 20978802..0d4114a3 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 75de088f..690d73d8 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -15,9 +15,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index e6c6facb..8e32ab20 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index 3fd60208..14917e4c 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertIssuedExportPass;
diff --git a/check-certificates.rsc b/check-certificates.rsc
index 505ec4b0..c10e33ba 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertRenewTime;
diff --git a/check-health.rsc b/check-health.rsc
index 40ce101d..1b92d1e4 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CheckHealthCPUUtilization;
diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index 6030e4d4..1a5e08ce 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global SentLteFirmwareUpgradeNotification;
diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index d46f0b49..c2f0dff0 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 932256ad..34d06475 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index fa6198a0..06b8d844 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index 4082bbbe..6716582d 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index 51671562..53e6b0a8 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index af0dd8b2..43ac8519 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index a1b01fc8..3ecd6b66 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 6ba6ce2f..d496350c 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 43ce3331..5a1df2f1 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 7e1714dc..c441e581 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index 724682b1..3615bb9b 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index 0a5f3b56..9da53336 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index 71307b70..62cace12 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index 1f29f0b4..667708cd 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index e66704b1..a9c91e1c 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Domain;
diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index d5774db1..e3ca55b3 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 1a892dac..4ee3c344 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global FwAddrLists;
diff --git a/global-config.rsc b/global-config.rsc
index 42a457a5..c0577ff6 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -6,6 +6,9 @@
 # global configuration
 # https://rsc.eworm.de/
 
+# Warning: Do *NOT* copy this line to overlay!
+:global GlobalConfigReady false;
+
 # Set this to 'true' to disable news and change notifications.
 :global NoNewsAndChangesNotification false;
 
@@ -275,3 +278,6 @@
         [ /system/script/get $Script name ] . " failed!");
   }
 }
+
+# signal we are ready
+:set GlobalConfigReady true;
diff --git a/global-wait.rsc b/global-wait.rsc
index ca3fc0c4..23b56298 100644
--- a/global-wait.rsc
+++ b/global-wait.rsc
@@ -8,5 +8,6 @@
 # wait for global-functions to finish
 # https://rsc.eworm.de/doc/global-wait.md
 
+:global GlobalConfigReady;
 :global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:while ($GlobalConfigReady != true || $GlobalFunctionsReady != true) do={ :delay 500ms; }
diff --git a/gps-track.rsc b/gps-track.rsc
index d66bf009..4cc50663 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global GpsTrackUrl;
diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index fd0e5545..e4ac9678 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 11f359cc..d51e1d03 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -15,9 +15,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 7f0ebae8..8bb2631b 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index a9a14075..8977cee1 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 84a43bcc..c5d977d1 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index 5c5afdab..6a97e460 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index fb7b55c1..1b5ed133 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Domain;
diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index 24167c01..580a426c 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/lease-script.rsc b/lease-script.rsc
index 501e0470..b166ee3b 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Grep;
diff --git a/log-forward.rsc b/log-forward.rsc
index 3774dac7..be7eff7b 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/mode-button.rsc b/mode-button.rsc
index 6d8b7b3a..52789bf0 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global ModeButton;
diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 5a928f0a..3da14987 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;
diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index 0c483305..fb8e8d5e 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global NetwatchNotify;
diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index cdc06e55..26f8aa37 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/packages-update.rsc b/packages-update.rsc
index 81a6d132..4fde131b 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;
diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ef08c9d8..f16d73f3 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/sms-action.rsc b/sms-action.rsc
index 0f02bcec..47e19223 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global SmsAction;
diff --git a/sms-forward.rsc b/sms-forward.rsc
index 9c3e4a55..8ca5ae43 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index f62034c1..b1f7f99e 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index 8d98eaa7..dd7d63e4 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CharacterReplace;
diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 2deb5b22..8e5e1d0f 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;