diff --git a/jOOQ/src/main/java/org/jooq/Fields.java b/jOOQ/src/main/java/org/jooq/Fields.java
index 1c85fdd0cc..486b08e704 100644
--- a/jOOQ/src/main/java/org/jooq/Fields.java
+++ b/jOOQ/src/main/java/org/jooq/Fields.java
@@ -103,6 +103,12 @@ import org.jetbrains.annotations.Nullable;
  */
 public interface Fields {
 
+    /**
+     * Get another {@link Fields} instance that includes the hidden fields.
+     */
+    @NotNull
+    Fields fieldsIncludingHidden();
+
     /**
      * Get all fields known to this type.
      */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index a15aeaaeea..3ef55a6bc2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -69,7 +69,6 @@ import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 // ...
-// ...
 import static org.jooq.SQLDialect.TRINO;
 // ...
 import static org.jooq.conf.SettingsTools.renderLocale;
@@ -102,7 +101,6 @@ import static org.jooq.impl.Tools.autoAlias;
 import static org.jooq.impl.Tools.flattenCollection;
 import static org.jooq.impl.Tools.increment;
 import static org.jooq.impl.Tools.map;
-import static org.jooq.impl.Tools.orElse;
 import static org.jooq.impl.Tools.reference;
 import static org.jooq.impl.Tools.removeGenerator;
 import static org.jooq.impl.Tools.unalias;
@@ -152,6 +150,7 @@ import org.jooq.Name;
 import org.jooq.Param;
 // ...
 import org.jooq.QualifiedAsterisk;
+import org.jooq.QueryPart;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.Row;
@@ -175,7 +174,6 @@ import org.jooq.impl.QOM.ResultOption;
 import org.jooq.impl.Tools.BooleanDataKey;
 import org.jooq.impl.Tools.SimpleDataKey;
 import org.jooq.tools.JooqLogger;
-import org.jooq.tools.StringUtils;
 import org.jooq.tools.jdbc.JDBCUtils;
 
 
@@ -206,6 +204,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
     final Table<R>                               table;
     final SelectFieldList<SelectFieldOrAsterisk> returning;
     final List<Field<?>>                         returningResolvedAsterisks;
+    boolean                                      forceResolveAsterisks;
     Result<Record>                               returnedResult;
     Result<R>                                    returned;
 
@@ -216,6 +215,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
         this.table = table;
         this.returning = new SelectFieldList<>();
         this.returningResolvedAsterisks = new ArrayList<>();
+        this.forceResolveAsterisks = false;
     }
 
     // ------------------------------------------------------------------------
@@ -243,20 +243,36 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
         returning.clear();
         returning.addAll(fields.isEmpty() ? Arrays.asList(table.fields()) : fields);
 
+        forceResolveAsterisks = false;
         returningResolvedAsterisks.clear();
-        for (SelectFieldOrAsterisk s : returning)
-            if (s instanceof Field<?> f)
+        for (SelectFieldOrAsterisk s : returning) {
+            if (s instanceof Field<?> f) {
                 returningResolvedAsterisks.add(f);
-            else if (s instanceof QualifiedAsterisk a)
+            }
+            else if (s instanceof QualifiedAsterisk a) {
+
+
+
+
                 returningResolvedAsterisks.addAll(Arrays.asList(a.qualifier().fields()));
-            else if (s instanceof Asterisk)
+            }
+            else if (s instanceof Asterisk) {
+
+
+
+
                 returningResolvedAsterisks.addAll(Arrays.asList(table.fields()));
-            else if (s instanceof Row r)
+            }
+            else if (s instanceof Row r) {
                 returningResolvedAsterisks.add(new RowAsField<>(r));
-            else if (s instanceof Table<?> t)
+            }
+            else if (s instanceof Table<?> t) {
                 returningResolvedAsterisks.add(new TableAsField<>(t));
-            else
+            }
+            else {
                 throw new UnsupportedOperationException("Type not supported: " + s);
+            }
+        }
     }
 
     // @Override
@@ -924,14 +940,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
                 ctx.formatSeparator()
                    .visit(K_RETURNING)
                    .sql(' ')
-                   .declareFields(true, c -> c.visit(
-
-                       // Firebird didn't support asterisks at all here until version 4.0
-                       // MariaDB doesn't support qualified asterisks: https://jira.mariadb.org/browse/MDEV-23178
-                       NO_SUPPORT_RETURNING_ASTERISK.contains(c.dialect())
-                     ? new SelectFieldList<>(returningResolvedAsterisks)
-                     : returning
-                   ));
+                   .declareFields(true, c -> c.visit(returningOrResolvedAsterisks(c)));
 
                 if (unqualify)
                     ctx.qualify(qualify);
@@ -939,6 +948,15 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
         }
     }
 
+    private QueryPart returningOrResolvedAsterisks(Context<?> c){
+
+        // Firebird didn't support asterisks at all here until version 4.0
+        // MariaDB doesn't support qualified asterisks: https://jira.mariadb.org/browse/MDEV-23178
+        return NO_SUPPORT_RETURNING_ASTERISK.contains(c.dialect()) || forceResolveAsterisks
+            ? new SelectFieldList<>(returningResolvedAsterisks)
+            : returning;
+    }
+
     final boolean nativeSupportReturning(Scope ctx) {
 
         // [#15316] The historic RETURNING emulation of SQLite was available for INSERT only, using
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 89305713a5..0f1d94d8f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -70,6 +70,7 @@ import org.jooq.Converter;
 import org.jooq.DataType;
 import org.jooq.EmbeddableRecord;
 import org.jooq.Field;
+import org.jooq.Fields;
 import org.jooq.JSONFormat;
 import org.jooq.Name;
 import org.jooq.Record;
@@ -106,6 +107,7 @@ import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.MappingException;
 import org.jooq.tools.StringUtils;
 
+import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Document;
 import org.xml.sax.ContentHandler;
@@ -117,7 +119,13 @@ import org.xml.sax.SAXException;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-abstract class AbstractRecord extends AbstractStore implements Record {
+abstract class AbstractRecord
+extends
+    AbstractStore
+implements
+    Record,
+    FieldsTrait
+{
 
     final AbstractRow<? extends AbstractRecord> fields;
     final Object[]                              values;
@@ -176,138 +184,9 @@ abstract class AbstractRecord extends AbstractStore implements Record {
     // ------------------------------------------------------------------------
 
     @Override
-    public final Field<?>[] fields() {
-        return fields.fields();
-    }
-
-    @Override
-    public final Stream<Field<?>> fieldStream() {
-        return fields.fieldStream();
-    }
-
-    @Override
-    public final <T> Field<T> field(Field<T> field) {
-        return fields.field(field);
-    }
-
-    @Override
-    public final Field<?> field(String name) {
-        return fields.field(name);
-    }
-
-    @Override
-    public final <T> Field<T> field(String name, Class<T> type) {
-        return fields.field(name, type);
-    }
-
-    @Override
-    public final <T> Field<T> field(String name, DataType<T> dataType) {
-        return fields.field(name, dataType);
-    }
-
-    @Override
-    public final Field<?> field(Name name) {
-        return fields.field(name);
-    }
-
-    @Override
-    public final <T> Field<T> field(Name name, Class<T> type) {
-        return fields.field(name, type);
-    }
-
-    @Override
-    public final <T> Field<T> field(Name name, DataType<T> dataType) {
-        return fields.field(name, dataType);
-    }
-
-    @Override
-    public final Field<?> field(int index) {
-        return index >= 0 && index < fields.size() ? fields.field(index) : null;
-    }
-
-    @Override
-    public final <T> Field<T> field(int index, Class<T> type) {
-        return fields.field(index, type);
-    }
-
-    @Override
-    public final <T> Field<T> field(int index, DataType<T> dataType) {
-        return fields.field(index, dataType);
-    }
-
-    @Override
-    public final Field<?>[] fields(Field<?>... f) {
-        return fields.fields(f);
-    }
-
-    @Override
-    public final Field<?>[] fields(String... fieldNames) {
-        return fields.fields(fieldNames);
-    }
-
-    @Override
-    public final Field<?>[] fields(Name... fieldNames) {
-        return fields.fields(fieldNames);
-    }
-
-    @Override
-    public final Field<?>[] fields(int... fieldIndexes) {
-        return fields.fields(fieldIndexes);
-    }
-
-    @Override
-    public final int indexOf(Field<?> field) {
-        return fields.indexOf(field);
-    }
-
-    @Override
-    public final int indexOf(String fieldName) {
-        return fields.indexOf(fieldName);
-    }
-
-    @Override
-    public final int indexOf(Name fieldName) {
-        return fields.indexOf(fieldName);
-    }
-
-    @Override
-    public final Class<?>[] types() {
-        return fields.types();
-    }
-
-    @Override
-    public final Class<?> type(int fieldIndex) {
-        return fields.type(fieldIndex);
-    }
-
-    @Override
-    public final Class<?> type(String fieldName) {
-        return fields.type(fieldName);
-    }
-
-    @Override
-    public final Class<?> type(Name fieldName) {
-        return fields.type(fieldName);
-    }
-
-    @Override
-    public final DataType<?>[] dataTypes() {
-        return fields.dataTypes();
-    }
-
-    @Override
-    public final DataType<?> dataType(int fieldIndex) {
-        return fields.dataType(fieldIndex);
-    }
-
-    @Override
-    public final DataType<?> dataType(String fieldName) {
-        return fields.dataType(fieldName);
-    }
-
-    @Override
-    public final DataType<?> dataType(Name fieldName) {
-        return fields.dataType(fieldName);
+    @Internal
+    public final Fields internalFieldsRow() {
+        return fields;
     }
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java
index 223334c481..935184054f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java
@@ -61,6 +61,7 @@ import org.jooq.Context;
 import org.jooq.Converter;
 import org.jooq.DataType;
 import org.jooq.Field;
+import org.jooq.Fields;
 import org.jooq.Name;
 import org.jooq.QueryPart;
 import org.jooq.Record;
@@ -79,7 +80,14 @@ import org.jooq.impl.QOM.UnmodifiableList;
  * A common base class for the various degrees of {@link Row1}, {@link Row2},
  * etc.
  */
-abstract class AbstractRow<R extends Record> extends AbstractQueryPart implements Row, SelectField<R> {
+abstract class AbstractRow<R extends Record>
+extends
+    AbstractQueryPart
+implements
+    Row,
+    FieldsTrait,
+    SelectField<R>
+{
 
     private static final Clause[] CLAUSES = { FIELD_ROW };
 
@@ -300,170 +308,16 @@ abstract class AbstractRow<R extends Record> extends AbstractQueryPart implement
         return fields.size();
     }
 
+    @Override
+    public final Fields internalFieldsRow() {
+        return fields;
+    }
+
     @Override
     public final Row fieldsRow() {
         return this;
     }
 
-    @Override
-    public final Stream<Field<?>> fieldStream() {
-        return Stream.of(fields());
-    }
-
-    @Override
-    public final <T> Field<T> field(Field<T> field) {
-        return fields.field(field);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(String)}.
-     */
-    @Deprecated
-    @Override
-    public final Field<?> field(String name) {
-        return fields.field(name);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(String, Class)}.
-     */
-    @Deprecated
-    @Override
-    public final <T> Field<T> field(String name, Class<T> type) {
-        return fields.field(name, type);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(String, DataType)}.
-     */
-    @Deprecated
-    @Override
-    public final <T> Field<T> field(String name, DataType<T> dataType) {
-        return fields.field(name, dataType);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(Name)}.
-     */
-    @Deprecated
-    @Override
-    public final Field<?> field(Name name) {
-        return fields.field(name);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(Name, Class)}.
-     */
-    @Deprecated
-    @Override
-    public final <T> Field<T> field(Name name, Class<T> type) {
-        return fields.field(name, type);
-    }
-
-    /**
-     * @deprecated This method hides static import {@link DSL#field(Name, DataType)}.
-     */
-    @Deprecated
-    @Override
-    public final <T> Field<T> field(Name name, DataType<T> dataType) {
-        return fields.field(name, dataType);
-    }
-
-    @Override
-    public final Field<?> field(int index) {
-        return fields.field(index);
-    }
-
-    @Override
-    public final <T> Field<T> field(int index, Class<T> type) {
-        return fields.field(index, type);
-    }
-
-    @Override
-    public final <T> Field<T> field(int index, DataType<T> dataType) {
-        return fields.field(index, dataType);
-    }
-
-    @Override
-    public final Field<?>[] fields() {
-        return fields.fields();
-    }
-
-    @Override
-    public final Field<?>[] fields(Field<?>... f) {
-        return fields.fields(f);
-    }
-
-    @Override
-    public final Field<?>[] fields(String... fieldNames) {
-        return fields.fields(fieldNames);
-    }
-
-    @Override
-    public final Field<?>[] fields(Name... fieldNames) {
-        return fields.fields(fieldNames);
-    }
-
-    @Override
-    public final Field<?>[] fields(int... fieldIndexes) {
-        return fields.fields(fieldIndexes);
-    }
-
-    @Override
-    public final int indexOf(Field<?> field) {
-        return fields.indexOf(field);
-    }
-
-    @Override
-    public final int indexOf(String fieldName) {
-        return fields.indexOf(fieldName);
-    }
-
-    @Override
-    public final int indexOf(Name fieldName) {
-        return fields.indexOf(fieldName);
-    }
-
-    @Override
-    public final Class<?>[] types() {
-        return fields.types();
-    }
-
-    @Override
-    public final Class<?> type(int fieldIndex) {
-        return fields.type(fieldIndex);
-    }
-
-    @Override
-    public final Class<?> type(String fieldName) {
-        return fields.type(fieldName);
-    }
-
-    @Override
-    public final Class<?> type(Name fieldName) {
-        return fields.type(fieldName);
-    }
-
-    @Override
-    public final DataType<?>[] dataTypes() {
-        return fields.dataTypes();
-    }
-
-    @Override
-    public final DataType<?> dataType(int fieldIndex) {
-        return fields.dataType(fieldIndex);
-    }
-
-    @Override
-    public final DataType<?> dataType(String fieldName) {
-        return fields.dataType(fieldName);
-    }
-
-    @Override
-    public final DataType<?> dataType(Name fieldName) {
-        return fields.dataType(fieldName);
-    }
-
     // ------------------------------------------------------------------------
     // [NOT] NULL predicates
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
index 15614b55fa..12ec81640f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
@@ -193,7 +193,7 @@ final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R>
     }
 
     final FieldsImpl<R> fields1() {
-        Field<?>[] s = FieldsImpl.fieldsRow0((FieldsTrait) query).fields();
+        Field<?>[] s = FieldsImpl.internalFieldsRow0((FieldsTrait) query).fields();
 
         // [#10565] Can't reuse s.length, see explanation below
         Field<?>[] f = new Field[Tools.degree(query)];
diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
index e9eb10304b..a9fdb71edc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
@@ -37,7 +37,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.FieldsImpl.fieldsRow0;
+import static org.jooq.impl.FieldsImpl.internalFieldsRow0;
 import static org.jooq.impl.Tools.EMPTY_NAME;
 import static org.jooq.impl.Tools.map;
 
@@ -136,7 +136,7 @@ implements
         if (fieldNameFunction != null)
             return new CommonTableExpressionImpl(
                 new DerivedColumnListImpl(name, map(
-                    fieldsRow0((FieldsTrait) q).fields(),
+                    internalFieldsRow0((FieldsTrait) q).fields(),
                     (f, i) -> DSL.name(fieldNameFunction.apply(f, i)),
                     Name[]::new
                 )),
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java
index d69c22fcaa..1ce728fa9d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java
@@ -58,6 +58,7 @@ import org.jooq.Context;
 import org.jooq.Converter;
 import org.jooq.DataType;
 import org.jooq.Field;
+import org.jooq.Fields;
 import org.jooq.Name;
 import org.jooq.Record;
 import org.jooq.RecordMapper;
@@ -205,8 +206,8 @@ final class FieldsImpl<R extends Record> extends AbstractQueryPart implements Re
      * [#13341] Prevent costly calls to Select.asTable() where not strictly
      * needed.
      */
-    static final Row fieldsRow0(FieldsTrait fields) {
-        return fields instanceof Select<?> s ? s.asTable("t").fieldsRow() : fields.fieldsRow();
+    static final Fields internalFieldsRow0(FieldsTrait fields) {
+        return fields instanceof Select<?> s ? ((FieldsTrait) s.asTable("t")).internalFieldsRow() : fields.internalFieldsRow();
     }
 
     private static final ThrowingFunction<SelectField<?>, Field<?>, RuntimeException> toField() {
@@ -547,6 +548,17 @@ final class FieldsImpl<R extends Record> extends AbstractQueryPart implements Re
     // XXX: List-like API
     // -------------------------------------------------------------------------
 
+
+    @Override
+    public final Fields fieldsIncludingHidden() {
+
+
+
+
+
+        return this;
+    }
+
     final void add(Field<?> f) {
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldsTrait.java b/jOOQ/src/main/java/org/jooq/impl/FieldsTrait.java
index 386d06fba9..c102b4914c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldsTrait.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldsTrait.java
@@ -37,7 +37,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.FieldsImpl.fieldsRow0;
+import static org.jooq.impl.FieldsImpl.internalFieldsRow0;
 
 import java.util.stream.Stream;
 
@@ -46,6 +46,8 @@ import org.jooq.Field;
 import org.jooq.Fields;
 import org.jooq.Name;
 
+import org.jetbrains.annotations.ApiStatus.Internal;
+
 /**
  * An internal base implementation of {@link Fields}, implementing all the
  * convenience methods.
@@ -54,19 +56,29 @@ import org.jooq.Name;
  */
 interface FieldsTrait extends Fields {
 
+    @Internal
+    default Fields internalFieldsRow() {
+        return fieldsRow();
+    }
+
+    @Override
+    default Fields fieldsIncludingHidden() {
+        return internalFieldsRow().fieldsIncludingHidden();
+    }
+
     @Override
     default Field<?>[] fields() {
-        return fieldsRow().fields();
+        return internalFieldsRow().fields();
     }
 
     @Override
     default Stream<Field<?>> fieldStream() {
-        return fieldsRow().fieldStream();
+        return internalFieldsRow().fieldStream();
     }
 
     @Override
     default <T> Field<T> field(Field<T> field) {
-        return fieldsRow().field(field);
+        return internalFieldsRow().field(field);
     }
 
     /**
@@ -75,7 +87,7 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default Field<?> field(String name) {
-        return fieldsRow().field(name);
+        return internalFieldsRow().field(name);
     }
 
     /**
@@ -84,7 +96,7 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default <T> Field<T> field(String name, Class<T> type) {
-        return fieldsRow().field(name, type);
+        return internalFieldsRow().field(name, type);
     }
 
 
@@ -94,7 +106,7 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default <T> Field<T> field(String name, DataType<T> dataType) {
-        return fieldsRow().field(name, dataType);
+        return internalFieldsRow().field(name, dataType);
     }
 
     /**
@@ -103,7 +115,7 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default Field<?> field(Name name) {
-        return fieldsRow().field(name);
+        return internalFieldsRow().field(name);
     }
 
     /**
@@ -112,7 +124,7 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default <T> Field<T> field(Name name, Class<T> type) {
-        return fieldsRow().field(name, type);
+        return internalFieldsRow().field(name, type);
     }
 
     /**
@@ -121,96 +133,96 @@ interface FieldsTrait extends Fields {
     @Deprecated
     @Override
     default <T> Field<T> field(Name name, DataType<T> dataType) {
-        return fieldsRow().field(name, dataType);
+        return internalFieldsRow().field(name, dataType);
     }
 
     @Override
     default Field<?> field(int index) {
-        return fieldsRow().field(index);
+        return internalFieldsRow().field(index);
     }
 
     @Override
     default <T> Field<T> field(int index, Class<T> type) {
-        return fieldsRow().field(index, type);
+        return internalFieldsRow().field(index, type);
     }
 
     @Override
     default <T> Field<T> field(int index, DataType<T> dataType) {
-        return fieldsRow().field(index, dataType);
+        return internalFieldsRow().field(index, dataType);
     }
 
     @Override
     default Field<?>[] fields(Field<?>... fields) {
-        return fieldsRow().fields(fields);
+        return internalFieldsRow().fields(fields);
     }
 
     @Override
     default Field<?>[] fields(String... names) {
-        return fieldsRow().fields(names);
+        return internalFieldsRow().fields(names);
     }
 
     @Override
     default Field<?>[] fields(Name... names) {
-        return fieldsRow().fields(names);
+        return internalFieldsRow().fields(names);
     }
 
     @Override
     default Field<?>[] fields(int... indexes) {
-        return fieldsRow().fields(indexes);
+        return internalFieldsRow().fields(indexes);
     }
 
     @Override
     default int indexOf(Field<?> field) {
-        return fieldsRow().indexOf(field);
+        return internalFieldsRow().indexOf(field);
     }
 
     @Override
     default int indexOf(String name) {
-        return fieldsRow().indexOf(name);
+        return internalFieldsRow().indexOf(name);
     }
 
     @Override
     default int indexOf(Name name) {
-        return fieldsRow().indexOf(name);
+        return internalFieldsRow().indexOf(name);
     }
 
     @Override
     default Class<?>[] types() {
-        return fieldsRow0(this).types();
+        return internalFieldsRow0(this).types();
     }
 
     @Override
     default Class<?> type(int index) {
-        return fieldsRow0(this).type(index);
+        return internalFieldsRow0(this).type(index);
     }
 
     @Override
     default Class<?> type(String name) {
-        return fieldsRow0(this).type(name);
+        return internalFieldsRow0(this).type(name);
     }
 
     @Override
     default Class<?> type(Name name) {
-        return fieldsRow0(this).type(name);
+        return internalFieldsRow0(this).type(name);
     }
 
     @Override
     default DataType<?>[] dataTypes() {
-        return fieldsRow0(this).dataTypes();
+        return internalFieldsRow0(this).dataTypes();
     }
 
     @Override
     default DataType<?> dataType(int index) {
-        return fieldsRow0(this).dataType(index);
+        return internalFieldsRow0(this).dataType(index);
     }
 
     @Override
     default DataType<?> dataType(String name) {
-        return fieldsRow0(this).dataType(name);
+        return internalFieldsRow0(this).dataType(name);
     }
 
     @Override
     default DataType<?> dataType(Name name) {
-        return fieldsRow0(this).dataType(name);
+        return internalFieldsRow0(this).dataType(name);
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
index 76fa76e7e4..1aa222d4c9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
@@ -50,7 +50,7 @@ import static org.jooq.impl.ConstraintType.FOREIGN_KEY;
 import static org.jooq.impl.ConstraintType.PRIMARY_KEY;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.schema;
-import static org.jooq.impl.FieldsImpl.fieldsRow0;
+import static org.jooq.impl.FieldsImpl.internalFieldsRow0;
 import static org.jooq.impl.SQLDataType.BIGINT;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
 import static org.jooq.impl.Tools.allMatch;
@@ -1416,7 +1416,7 @@ final class Interpreter {
             for (int i = 0; i < columns.size(); i++)
                 addField(t, Integer.MAX_VALUE, (UnqualifiedName) columns.get(i).getUnqualifiedName(), columns.get(i).getDataType());
         else if (select != null)
-            for (Field<?> column : fieldsRow0((FieldsTrait) select).fields())
+            for (Field<?> column : internalFieldsRow0((FieldsTrait) select).fields())
                 addField(t, Integer.MAX_VALUE, (UnqualifiedName) column.getUnqualifiedName(), column.getDataType());
 
         return t;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 5e73abd136..b4b22304ab 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -15560,7 +15560,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
                 Name q = lookupName.qualifier();
                 boolean x = q.qualified();
                 if (x && q.equals(t.value().getQualifiedName()) || !x && q.last().equals(t.value().getName()))
-                    if ((found = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null)
+                    if ((found = Value.of(t.scopeLevel(), t.value().fieldsIncludingHidden().field(lookup.getName()))) != null)
                         break tableScopeLoop;
 
 
@@ -15571,7 +15571,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
 
 
             }
-            else if ((f = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null) {
+            else if ((f = Value.of(t.scopeLevel(), t.value().fieldsIncludingHidden().field(lookup.getName()))) != null) {
                 if (found == null || found.scopeLevel() < f.scopeLevel()) {
                     found = f;
                 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl1.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl1.java
index c7cd04c84a..897f6c3e10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl1.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl1.java
@@ -51,7 +51,6 @@ import org.jooq.Function1;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record1;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row1;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl10.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl10.java
index 3256bdd22b..b27438b2f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl10.java
@@ -51,7 +51,6 @@ import org.jooq.Function10;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record10;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row10;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl11.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl11.java
index a9f07cbf47..3471a3f1f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl11.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl11.java
@@ -51,7 +51,6 @@ import org.jooq.Function11;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record11;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row11;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl12.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl12.java
index f1e2203abf..e12d666801 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl12.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl12.java
@@ -51,7 +51,6 @@ import org.jooq.Function12;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record12;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row12;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl13.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl13.java
index 98a0db7897..6c59a42850 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl13.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl13.java
@@ -51,7 +51,6 @@ import org.jooq.Function13;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record13;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row13;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl14.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl14.java
index e6414f6b4c..90edcf8171 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl14.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl14.java
@@ -51,7 +51,6 @@ import org.jooq.Function14;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record14;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row14;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl15.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl15.java
index 2bb881fa3f..53ea79dc4e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl15.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl15.java
@@ -51,7 +51,6 @@ import org.jooq.Function15;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record15;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row15;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl16.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl16.java
index 28bded89da..cb7b692f20 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl16.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl16.java
@@ -51,7 +51,6 @@ import org.jooq.Function16;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record16;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row16;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl17.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl17.java
index 118679fe64..77d65286e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl17.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl17.java
@@ -51,7 +51,6 @@ import org.jooq.Function17;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record17;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row17;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl18.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl18.java
index 75c89778cd..877dc2aaf4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl18.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl18.java
@@ -51,7 +51,6 @@ import org.jooq.Function18;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record18;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row18;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl19.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl19.java
index 359102230c..064e75ba39 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl19.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl19.java
@@ -51,7 +51,6 @@ import org.jooq.Function19;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record19;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row19;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl2.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl2.java
index 7c0cda2bb8..734e16423f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl2.java
@@ -51,7 +51,6 @@ import org.jooq.Function2;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record2;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row2;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl20.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl20.java
index f193b79231..254a6f1a1e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl20.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl20.java
@@ -51,7 +51,6 @@ import org.jooq.Function20;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record20;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row20;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl21.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl21.java
index afb8217e78..588c190ed8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl21.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl21.java
@@ -51,7 +51,6 @@ import org.jooq.Function21;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record21;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row21;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl22.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl22.java
index 32122bda78..1f91056fc6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl22.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl22.java
@@ -51,7 +51,6 @@ import org.jooq.Function22;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record22;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row22;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl3.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl3.java
index 8b2f7668ec..374d92d0d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl3.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl3.java
@@ -51,7 +51,6 @@ import org.jooq.Function3;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record3;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row3;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl4.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl4.java
index e0622fae01..7818e1abe7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl4.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl4.java
@@ -51,7 +51,6 @@ import org.jooq.Function4;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record4;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row4;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl5.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl5.java
index b9053c9d81..442aeb2502 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl5.java
@@ -51,7 +51,6 @@ import org.jooq.Function5;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record5;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row5;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl6.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl6.java
index 4bad7f658e..c48aca98c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl6.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl6.java
@@ -51,7 +51,6 @@ import org.jooq.Function6;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record6;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row6;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl7.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl7.java
index 7d65c86c99..904671d0df 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl7.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl7.java
@@ -51,7 +51,6 @@ import org.jooq.Function7;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record7;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row7;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl8.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl8.java
index c46a31c062..a0b873b91c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl8.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl8.java
@@ -51,7 +51,6 @@ import org.jooq.Function8;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record8;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row8;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl9.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl9.java
index fd8de4fbbf..e1c0a85c8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl9.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl9.java
@@ -51,7 +51,6 @@ import org.jooq.Function9;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
 import org.jooq.Record9;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.Row9;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImplN.java b/jOOQ/src/main/java/org/jooq/impl/RowImplN.java
index 6ff942e96d..1548288dae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImplN.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImplN.java
@@ -49,7 +49,6 @@ import org.jooq.Condition;
 import org.jooq.Field;
 import org.jooq.QuantifiedSelect;
 import org.jooq.Record;
-import org.jooq.Records;
 import org.jooq.Result;
 import org.jooq.Row;
 import org.jooq.RowN;