diff --git a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
index 9bdf6fee5b..16ba1a21ac 100644
--- a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
+++ b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
@@ -74,7 +74,15 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
 
     /**
      * Add a <code>FILTER clause</code> to the aggregate function.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #filterWhere(Condition...)} or
+     *             {@link #filterWhere(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     WindowBeforeOverStep<T> filterWhere(Boolean field);
 
diff --git a/jOOQ/src/main/java/org/jooq/Condition.java b/jOOQ/src/main/java/org/jooq/Condition.java
index 947b53a97a..16f9212ffc 100644
--- a/jOOQ/src/main/java/org/jooq/Condition.java
+++ b/jOOQ/src/main/java/org/jooq/Condition.java
@@ -77,7 +77,14 @@ public interface Condition extends QueryPart {
      *
      * @param other The other condition
      * @return The combined condition
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     Condition and(Boolean other);
 
@@ -183,7 +190,15 @@ public interface Condition extends QueryPart {
      *
      * @param other The other condition
      * @return The combined condition
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     Condition andNot(Boolean other);
 
@@ -233,7 +248,14 @@ public interface Condition extends QueryPart {
      *
      * @param other The other condition
      * @return The combined condition
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     Condition or(Boolean other);
 
@@ -339,7 +361,15 @@ public interface Condition extends QueryPart {
      *
      * @param other The other condition
      * @return The combined condition
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Boolean)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     Condition orNot(Boolean other);
 
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index 2a8782cefd..82339bf091 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -75,7 +75,14 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     DeleteConditionStep<R> and(Boolean condition);
 
@@ -160,7 +167,15 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     DeleteConditionStep<R> andNot(Boolean condition);
 
@@ -194,7 +209,14 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     DeleteConditionStep<R> or(Boolean condition);
 
@@ -279,7 +301,15 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     DeleteConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index 5a642df8fc..25bd3f6ab6 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -81,7 +81,15 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R>, D
 
     /**
      * Add conditions to the query.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition...)} or
+     *             {@link #where(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     DeleteConditionStep<R> where(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
index b51046c5b5..ce65bebf9b 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
@@ -67,7 +67,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     DivideByOnConditionStep and(Boolean condition);
 
@@ -152,7 +159,15 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     DivideByOnConditionStep andNot(Boolean condition);
 
@@ -187,7 +202,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     DivideByOnConditionStep or(Boolean condition);
 
@@ -272,7 +294,15 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     DivideByOnConditionStep orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
index 6d44454817..fad34f5bc4 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
@@ -65,7 +65,14 @@ public interface DivideByOnStep {
 
     /**
      * Add a division condition to the <code>DIVIDE BY</code> clause
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition...)} or
+     *             {@link #on(Field)} instead. Due to ambiguity between calling
+     *             this method using {@link Field#equals(Object)} argument, vs.
+     *             calling the other method via a {@link Field#equal(Object)}
+     *             argument, this method will be removed in the future.
      */
+    @Deprecated
     @Support
     DivideByOnConditionStep on(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
index cf106067fd..54215dee47 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
@@ -105,7 +105,15 @@ public interface MergeMatchedDeleteStep<R extends Record> extends MergeNotMatche
      * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
      * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
      * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #deleteWhere(Condition)} or
+     *             {@link #deleteWhere(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     MergeNotMatchedStep<R> deleteWhere(Boolean condition);
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
index 30362129d7..b6d654fdc8 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
@@ -105,7 +105,15 @@ public interface MergeMatchedWhereStep<R extends Record> extends MergeNotMatched
      * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
      * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
      * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or
+     *             {@link #where(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     MergeMatchedDeleteStep<R> where(Boolean condition);
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
index 34e66ce8ad..4494b1b0d4 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
@@ -105,7 +105,15 @@ public interface MergeNotMatchedWhereStep<R extends Record> extends MergeFinalSt
      * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
      * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
      * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or
+     *             {@link #where(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     MergeFinalStep<R> where(Boolean condition);
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
index 9a9b4dc612..15d8dd4b9a 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
@@ -87,7 +87,15 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID, HSQLDB })
     MergeOnConditionStep<R> and(Boolean condition);
 
@@ -172,7 +180,15 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID, HSQLDB })
     MergeOnConditionStep<R> andNot(Boolean condition);
 
@@ -207,7 +223,15 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID, HSQLDB })
     MergeOnConditionStep<R> or(Boolean condition);
 
@@ -292,7 +316,15 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID, HSQLDB })
     MergeOnConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
index 34c565bf39..4b04c5e75f 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
@@ -85,7 +85,15 @@ public interface MergeOnStep<R extends Record> {
 
     /**
      * Provide join conditions and proceed to the next step
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition...)} or
+     *             {@link #on(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID, HSQLDB })
     MergeOnConditionStep<R> on(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
index fd27dadb30..f29261c0b9 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
@@ -104,7 +104,15 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectConditionStep<R> and(Boolean condition);
 
@@ -189,7 +197,15 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectConditionStep<R> andNot(Boolean condition);
 
@@ -224,7 +240,15 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectConditionStep<R> or(Boolean condition);
 
@@ -309,7 +333,15 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
index 822eafc5dc..b78ec834d2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
@@ -106,7 +106,15 @@ public interface SelectConnectByConditionStep<R extends Record> extends SelectSt
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     SelectConnectByConditionStep<R> and(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
index 4278e8f7da..ee254f78ce 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
@@ -104,7 +104,15 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
 
     /**
      * Add an Oracle-specific <code>CONNECT BY</code> clause to the query
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #connectBy(Condition)} or
+     *             {@link #connectBy(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     SelectConnectByConditionStep<R> connectBy(Boolean condition);
 
@@ -185,7 +193,15 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
     /**
      * Add an Oracle-specific <code>CONNECT BY NOCYCLE</code> clause to the
      * query
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #connectByNoCycle(Condition)}
+     *             or {@link #connectByNoCycle(Field)} instead. Due to ambiguity
+     *             between calling this method using
+     *             {@link Field#equals(Object)} argument, vs. calling the other
+     *             method via a {@link Field#equal(Object)} argument, this
+     *             method will be removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     SelectConnectByConditionStep<R> connectByNoCycle(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
index 89def391a2..77903f3c95 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
@@ -104,7 +104,15 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectHavingConditionStep<R> and(Boolean condition);
 
@@ -189,7 +197,15 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectHavingConditionStep<R> andNot(Boolean condition);
 
@@ -224,7 +240,15 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectHavingConditionStep<R> or(Boolean condition);
 
@@ -309,7 +333,15 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectHavingConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
index 913b5a312b..8fe8a064c2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
@@ -110,7 +110,15 @@ public interface SelectHavingStep<R extends Record> extends SelectWindowStep<R>
 
     /**
      * Add a <code>HAVING</code> clause to the query.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #having(Condition...)} or
+     *             {@link #having(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectHavingConditionStep<R> having(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
index bd2d081f5c..4819a2c0b9 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
@@ -104,7 +104,15 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectOnConditionStep<R> and(Boolean condition);
 
@@ -189,7 +197,15 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectOnConditionStep<R> andNot(Boolean condition);
 
@@ -224,7 +240,15 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectOnConditionStep<R> or(Boolean condition);
 
@@ -309,7 +333,15 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator and proceed to the next step.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectOnConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
index b77bd2fcb3..5b0ee0e1b4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
@@ -104,7 +104,15 @@ public interface SelectOnStep<R extends Record> {
 
     /**
      * Add an <code>ON</code> clause to the previous <code>JOIN</code>.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition...)} or
+     *             {@link #on(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectOnConditionStep<R> on(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
index b5b934a4d0..161cbdb017 100644
--- a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
@@ -107,7 +107,15 @@ public interface SelectStartWithStep<R extends Record> extends SelectGroupByStep
     /**
      * Add an Oracle-specific <code>START WITH</code> clause to the query's
      * <code>CONNECT BY</code> clause.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #startWith(Condition)} or
+     *             {@link #startWith(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support({ CUBRID })
     SelectGroupByStep<R> startWith(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
index 60a50dbda1..6ef79cc26d 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
@@ -110,7 +110,15 @@ public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R
 
     /**
      * Add a <code>WHERE</code> clause to the query.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition...)} or
+     *             {@link #where(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     SelectConditionStep<R> where(Boolean field);
 
diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
index c146bc17d8..d39e5770ce 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
@@ -70,7 +70,15 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     TableOnConditionStep<R> and(Boolean condition);
 
@@ -155,7 +163,15 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     TableOnConditionStep<R> andNot(Boolean condition);
 
@@ -190,7 +206,15 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     TableOnConditionStep<R> or(Boolean condition);
 
@@ -275,7 +299,15 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     TableOnConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index 080f17229a..e1329cbb4a 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -70,7 +70,15 @@ public interface TableOnStep<R extends Record> {
 
     /**
      * Add an <code>ON</code> clause to the <code>JOIN</code>.
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition...)} or
+     *             {@link #on(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     TableOnConditionStep<R> on(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index efb04d8bb2..c65f085832 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -77,7 +77,15 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#AND} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or
+     *             {@link #and(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     UpdateConditionStep<R> and(Boolean condition);
 
@@ -162,7 +170,15 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#AND} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or
+     *             {@link #andNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     UpdateConditionStep<R> andNot(Boolean condition);
 
@@ -197,7 +213,15 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
     /**
      * Combine the currently assembled conditions with another one using the
      * {@link Operator#OR} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or
+     *             {@link #or(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     UpdateConditionStep<R> or(Boolean condition);
 
@@ -282,7 +306,15 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
     /**
      * Combine the currently assembled conditions with a negated other one using
      * the {@link Operator#OR} operator
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or
+     *             {@link #orNot(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     UpdateConditionStep<R> orNot(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index 6da4339685..368e6fd1dd 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -83,7 +83,15 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, U
 
     /**
      * Add conditions to the query
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition...)} or
+     *             {@link #where(Field)} instead. Due to ambiguity between
+     *             calling this method using {@link Field#equals(Object)}
+     *             argument, vs. calling the other method via a
+     *             {@link Field#equal(Object)} argument, this method will be
+     *             removed in the future.
      */
+    @Deprecated
     @Support
     UpdateConditionStep<R> where(Boolean condition);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 9ff1625008..10fd5a3982 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -8505,7 +8505,14 @@ public class DSL {
      * {@link #not(Condition)}, {@link #condition(Field)}, i.e. <code><pre>
      * field(not(condition(field)));
      * </pre></code>
+     *
+     * @deprecated - 3.8.0 - [#4763] - Use {@link #not(Condition)} instead. Due
+     *             to ambiguity between calling this method using
+     *             {@link Field#equals(Object)} argument, vs. calling the other
+     *             method via a {@link Field#equal(Object)} argument, this
+     *             method will be removed in the future.
      */
+    @Deprecated
     @Support
     public static Field<Boolean> not(Boolean value) {
         return not(Utils.field(value, Boolean.class));