diff --git a/docs/config/src/client.yml b/docs/config/src/client.yml
index 4d46a7cf..c44d34ca 100644
--- a/docs/config/src/client.yml
+++ b/docs/config/src/client.yml
@@ -61,6 +61,24 @@
   info_ru: |
     Повторять запросы записи, завершившиеся с ошибками нехватки места, т.е.
     ожидать, пока на OSD не освободится место.
+- name: client_wait_up_timeout
+  type: sec
+  default: 16
+  online: true
+  info: |
+    Wait for this number of seconds until PGs are up when doing operations
+    which require all PGs to be up. Currently only used by object listings
+    in delete and merge-based commands ([vitastor-cli rm](../usage/cli.en.md#rm), merge and so on).
+
+    The default value is calculated as `1 + OSD lease timeout`, which is
+    `1 + etcd_report_interval + max_etcd_attempts*2*etcd_quick_timeout`.
+  info_ru: |
+    Время ожидания поднятия PG при операциях, требующих активности всех PG.
+    В данный момент используется листингами объектов в командах, использующих
+    удаление и слияние ([vitastor-cli rm](../usage/cli.ru.md#rm), merge и подобные).
+
+    Значение по умолчанию вычисляется как `1 + время lease OSD`, равное
+    `1 + etcd_report_interval + max_etcd_attempts*2*etcd_quick_timeout`.
 - name: client_max_dirty_bytes
   type: int
   default: 33554432
diff --git a/docs/usage/cli.en.md b/docs/usage/cli.en.md
index 17da64fb..c4f2d14f 100644
--- a/docs/usage/cli.en.md
+++ b/docs/usage/cli.en.md
@@ -222,6 +222,7 @@ Remove inode data without changing metadata.
               Requires more memory, but allows to show correct removal progress.
 --min-offset  Purge only data starting with specified offset.
 --max-offset  Purge only data before specified offset.
+--client_wait_up_timeout 16  Timeout for waiting until PGs are up in seconds.
 ```
 
 ## merge-data
diff --git a/docs/usage/cli.ru.md b/docs/usage/cli.ru.md
index 1dab8b89..1eba78b6 100644
--- a/docs/usage/cli.ru.md
+++ b/docs/usage/cli.ru.md
@@ -227,6 +227,7 @@ vitastor-cli dd [iimg=<image> | if=<file>] [oimg=<image> | of=<file>] [bs=1M] \
               Требует больше памяти, но позволяет правильно печатать прогресс удаления.
 --min-offset  Удалять только данные, начиная с заданного смещения.
 --max-offset  Удалять только данные до (исключительно) заданного смещения.
+--client_wait_up_timeout 16  Время ожидания поднятия PG в секундах.
 ```
 
 ## merge-data
diff --git a/src/client/cluster_client.cpp b/src/client/cluster_client.cpp
index 2f8559bf..cf141145 100644
--- a/src/client/cluster_client.cpp
+++ b/src/client/cluster_client.cpp
@@ -413,8 +413,8 @@ void cluster_client_t::on_load_config_hook(json11::Json::object & etcd_global_co
     peer_connect_timeout = config["peer_connect_timeout"].uint64_value();
     if (!peer_connect_timeout)
         peer_connect_timeout = 5;
-    if (!config["wait_up_timeout"].is_null())
-        wait_up_timeout = config["wait_up_timeout"].uint64_value();
+    if (!config["client_wait_up_timeout"].is_null())
+        wait_up_timeout = config["client_wait_up_timeout"].uint64_value();
     else
     {
         auto etcd_report_interval = config["etcd_report_interval"].uint64_value();
diff --git a/src/cmd/cli.cpp b/src/cmd/cli.cpp
index c917e383..3f834a2a 100644
--- a/src/cmd/cli.cpp
+++ b/src/cmd/cli.cpp
@@ -98,11 +98,11 @@ static const char* help_text =
     "\n"
     "vitastor-cli rm-data --pool <pool> --inode <inode> [--wait-list] [--min-offset <offset>]\n"
     "  Remove inode data without changing metadata.\n"
-    "  --wait-list           Retrieve full objects listings before starting to remove objects.\n"
-    "                        Requires more memory, but allows to show correct removal progress.\n"
-    "  --min-offset          Purge only data starting with specified offset.\n"
-    "  --max-offset          Purge only data before specified offset.\n"
-    "  --wait_up_timeout 16  Timeout for waiting until PGs are up in seconds.\n"
+    "  --wait-list   Retrieve full objects listings before starting to remove objects.\n"
+    "                Requires more memory, but allows to show correct removal progress.\n"
+    "  --min-offset  Purge only data starting with specified offset.\n"
+    "  --max-offset  Purge only data before specified offset.\n"
+    "  --client_wait_up_timeout 16  Timeout for waiting until PGs are up in seconds.\n"
     "\n"
     "vitastor-cli merge-data <from> <to> [--target <target>]\n"
     "  Merge layer data without changing metadata. Merge <from>..<to> to <target>.\n"