diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 545b24e..5e6cf0a 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 ac2c7fe..a6b4f41 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 8955991..e51198d 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 331de75..cadacb6 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 f0861f0..e41db27 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 da2ee02..632d2e6 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 f99a66c..c2221d2 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 9373b4c..11ced4c 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 ee82638..cab1e4c 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 91a9167..ea41120 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 cb6cb6f..a810356 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 2097880..0d4114a 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 75de088..690d73d 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 e6c6fac..8e32ab2 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 3fd6020..14917e4 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 505ec4b..c10e33b 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 40ce101..1b92d1e 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 6030e4d..1a5e08c 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 d46f0b4..c2f0dff 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 932256a..34d0647 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 fa6198a..06b8d84 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 4082bbb..6716582 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 5167156..53e6b0a 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 af0dd8b..43ac851 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 a1b01fc..3ecd6b6 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 6ba6ce2..d496350 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 43ce333..5a1df2f 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 7e1714d..c441e58 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 724682b..3615bb9 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 0a5f3b5..9da5333 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 71307b7..62cace1 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 1f29f0b..667708c 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 e66704b..a9c91e1 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 d5774db..e3ca55b 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 1a892da..4ee3c34 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 42a457a..c0577ff 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 ca3fc0c..23b5629 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 d66bf00..4cc5066 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 fd0e554..e4ac967 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 11f359c..d51e1d0 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 7f0ebae..8bb2631 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 a9a1407..8977cee 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 84a43bc..c5d977d 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 5c5afda..6a97e46 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 fb7b55c..1b5ed13 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 24167c0..580a426 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 501e047..b166ee3 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 3774dac..be7eff7 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 e5c836f..c6422f0 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 5a928f0..3da1498 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 0c48330..fb8e8d5 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 cdc06e5..26f8aa3 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 81a6d13..4fde131 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 ef08c9d..f16d73f 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 0f02bce..47e1922 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 9c3e4a5..8ca5ae4 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 f62034c..b1f7f99 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 8d98eaa..dd7d63e 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 2deb5b2..8e5e1d0 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;