diff --git a/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommandOptions.java b/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommandOptions.java
index 00451a8889..3c535d5c8a 100755
--- a/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommandOptions.java
+++ b/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommandOptions.java
@@ -94,7 +94,7 @@ public class ExportCommandOptions {
   protected Integer maxThreads;
 
   /**
-   * @deprecated As of release 3.6.2. Will be removed in release 4.0.0. Use --max-threads instead
+   * @deprecated As of release 3.17.0. Will be removed in release 4.0.0. Use --max-threads instead
    */
   @Deprecated
   @CommandLine.Option(
@@ -118,7 +118,10 @@ public class ExportCommandOptions {
   // TODO: test that -si false, works
   protected boolean scanStartInclusive;
 
-  // Deprecated option - kept for backward compatibility
+  /**
+   * @deprecated As of release 3.17.0. Will be removed in release 4.0.0. Use --start-inclusive
+   *     instead (inverted logic).
+   */
   @CommandLine.Option(
       names = {DEPRECATED_START_EXCLUSIVE_OPTION},
       description = "Deprecated: Use --start-inclusive instead (inverted logic)",
@@ -139,7 +142,10 @@ public class ExportCommandOptions {
       defaultValue = "true")
   protected boolean scanEndInclusive;
 
-  // Deprecated option - kept for backward compatibility
+  /**
+   * @deprecated As of release 3.17.0. Will be removed in release 4.0.0. Use --end-inclusive instead
+   *     (inverted logic).
+   */
   @CommandLine.Option(
       names = {DEPRECATED_END_EXCLUSIVE_OPTION},
       description = "Deprecated: Use --end-inclusive instead (inverted logic)",
diff --git a/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandOptions.java b/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandOptions.java
index 2d8c2555c6..7a923df360 100755
--- a/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandOptions.java
+++ b/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandOptions.java
@@ -46,7 +46,7 @@ public class ImportCommandOptions {
   protected Integer maxThreads;
 
   /**
-   * @deprecated As of release 3.6.2. Will be removed in release 4.0.0. Use --max-threads instead
+   * @deprecated As of release 3.17.0. Will be removed in release 4.0.0. Use --max-threads instead
    */
   @Deprecated
   @CommandLine.Option(
@@ -75,7 +75,7 @@ public class ImportCommandOptions {
   protected String controlFilePath;
 
   /**
-   * @deprecated As of release 3.6.2. Will be removed in release 4.0.0. Use --enable-log-success
+   * @deprecated As of release 3.17.0. Will be removed in release 4.0.0. Use --enable-log-success
    *     instead
    */
   @Deprecated