diff --git a/configs/fb40_all.conf b/configs/fb40_all.conf
index 103e7311..80ea8205 100644
--- a/configs/fb40_all.conf
+++ b/configs/fb40_all.conf
@@ -68,7 +68,7 @@ MaxIdentifierByteLength = 252
 MaxIdentifierCharLength = 63
 WireCryptPlugin = ChaCha, Arc4
 
-StatementTimeout = 300
+StatementTimeout = 600
 
 ConnectionIdleTimeout = 0
 ClearGTTAtRetaining = 0
diff --git a/configs/fb50_all.conf b/configs/fb50_all.conf
index a811cdcd..850fcda1 100644
--- a/configs/fb50_all.conf
+++ b/configs/fb50_all.conf
@@ -70,7 +70,7 @@ MaxIdentifierByteLength = 252
 MaxIdentifierCharLength = 63
 WireCryptPlugin = ChaCha, Arc4
 
-StatementTimeout = 300
+StatementTimeout = 600
 
 ConnectionIdleTimeout = 0
 ClearGTTAtRetaining = 0
@@ -81,3 +81,6 @@ TipCacheBlockSize = 4M
 # Added 03-apr-2023:
 ParallelWorkers = 1
 MaxParallelWorkers = 8
+
+# SubQueryConversion = false
+# OptimizeForFirstRows = false
diff --git a/configs/fb60_all.conf b/configs/fb60_all.conf
index ebb4196a..679b1edd 100644
--- a/configs/fb60_all.conf
+++ b/configs/fb60_all.conf
@@ -70,7 +70,7 @@ MaxIdentifierByteLength = 252
 MaxIdentifierCharLength = 63
 WireCryptPlugin = ChaCha, Arc4
 
-StatementTimeout = 300
+StatementTimeout = 600
 
 ConnectionIdleTimeout = 0
 ClearGTTAtRetaining = 0
@@ -81,3 +81,5 @@ TipCacheBlockSize = 4M
 # Added 03-apr-2023:
 ParallelWorkers = 1
 MaxParallelWorkers = 8
+
+#OptimizeForFirstRows = false