diff --git a/driver/src/main/java/oracle/nosql/driver/http/Client.java b/driver/src/main/java/oracle/nosql/driver/http/Client.java
index 66630eeb..7f7ddead 100644
--- a/driver/src/main/java/oracle/nosql/driver/http/Client.java
+++ b/driver/src/main/java/oracle/nosql/driver/http/Client.java
@@ -1842,6 +1842,9 @@ private boolean requireContentSigned(Request request) {
          * because in the client it's not known if the operation is on a
          * multi-region table or not. This is a small bit of overhead and
          * is ignored if the table is not multi-region
+         *
+         * The Request.oboToken is not required by non Java SDKs, remove
+         * request.getOboToken() != null if there is no Request.oboToken
          */
         return request instanceof AddReplicaRequest ||
                request instanceof DropReplicaRequest ||
diff --git a/driver/src/main/java/oracle/nosql/driver/iam/SignatureProvider.java b/driver/src/main/java/oracle/nosql/driver/iam/SignatureProvider.java
index b92cf61c..66783770 100644
--- a/driver/src/main/java/oracle/nosql/driver/iam/SignatureProvider.java
+++ b/driver/src/main/java/oracle/nosql/driver/iam/SignatureProvider.java
@@ -1086,6 +1086,14 @@ private SignatureDetails getSignatureWithContent(Request request,
         return sigDetails;
     }
 
+    /*
+     * Since Request.oboToken is not required by non Java SDKs, if there
+     * is no Request.oboToken, simplify this method as following:
+     *
+     * private String getDelegationToken(Request req) {
+     *     return delegationToken;
+     * }
+     */
     private String getDelegationToken(Request req) {
         return (req != null && req.getOboToken() != null) ?
                req.getOboToken() : delegationToken;
diff --git a/driver/src/main/java/oracle/nosql/driver/ops/Request.java b/driver/src/main/java/oracle/nosql/driver/ops/Request.java
index 4ba117cd..4c11e9f3 100644
--- a/driver/src/main/java/oracle/nosql/driver/ops/Request.java
+++ b/driver/src/main/java/oracle/nosql/driver/ops/Request.java
@@ -85,7 +85,8 @@ public abstract class Request {
 
     /**
      * @hidden
-     * This is only used by internal, cross-region requests
+     * This is only required by Java SDK for internal cross-region request, not
+     * by other drivers.
      */
     private String oboToken;
 
@@ -569,7 +570,9 @@ public boolean getDRLOptIn() {
 
     /**
      * @hidden
-     * internal use only
+     * This is only required by Java SDK for internal cross-region request, not
+     * by other drivers.
+     *
      * @param token the on-behalf-of token
      */
     public void setOboTokenInternal(String token) {
@@ -578,7 +581,9 @@ public void setOboTokenInternal(String token) {
 
     /**
      * @hidden
-     * internal use only
+     * This is only required by Java SDK for internal cross-region request, not
+     * by other drivers.
+     *
      * @return the on-behalf-of token
      */
     public String getOboToken() {