diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
index e65835752d..d325e4f20e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractAttributeMapping.java
@@ -27,7 +27,9 @@ public abstract class AbstractAttributeMapping implements AttributeMapping {
 		this.declaringType = declaringType;
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+ 	 */
 	protected AbstractAttributeMapping(AbstractAttributeMapping original) {
 		this( original.name, original.fetchableIndex, original.declaringType );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
index ad6b3e1455..24b7548c43 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
@@ -84,7 +84,9 @@ public abstract class AbstractEntityCollectionPart implements EntityCollectionPa
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected AbstractEntityCollectionPart(AbstractEntityCollectionPart original) {
 		this.navigableRole = original.navigableRole;
 		this.nature = original.nature;
@@ -220,7 +222,9 @@ public abstract class AbstractEntityCollectionPart implements EntityCollectionPa
 		return fetch;
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EagerCollectionFetch buildEagerCollectionFetch(
 			NavigablePath fetchedPath,
 			PluralAttributeMapping fetchedAttribute,
@@ -236,7 +240,9 @@ public abstract class AbstractEntityCollectionPart implements EntityCollectionPa
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetch buildEntityFetchJoined(
 			FetchParent fetchParent,
 			AbstractEntityCollectionPart abstractEntityCollectionPart,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
index 5b544600b6..ee2770d144 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractSingularAttributeMapping.java
@@ -49,7 +49,9 @@ public abstract class AbstractSingularAttributeMapping
 		this.propertyAccess = propertyAccess;
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected AbstractSingularAttributeMapping( AbstractSingularAttributeMapping original ) {
 		super( original );
 		this.propertyAccess = original.propertyAccess;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
index cafe354cd5..0a20a4d643 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractStateArrayContributorMapping.java
@@ -57,7 +57,9 @@ public abstract class AbstractStateArrayContributorMapping
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected AbstractStateArrayContributorMapping(AbstractStateArrayContributorMapping original) {
 		super( original );
 		this.attributeMetadata = original.attributeMetadata;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
index 810cc97f95..85a6dae057 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
@@ -446,6 +446,9 @@ public class MappingModelCreationHelper {
 		);
 	}
 
+	/**
+	 * For Hibernate Reactive
+	 */
 	@SuppressWarnings("rawtypes")
 	public static PluralAttributeMapping buildPluralAttributeMapping(
 			String attrName,
@@ -457,7 +460,6 @@ public class MappingModelCreationHelper {
 			CascadeStyle cascadeStyle,
 			FetchMode fetchMode,
 			MappingModelCreationProcess creationProcess,
-			// For Hibernate Reactive
 			Function<PluralAttributeMappingImpl, PluralAttributeMappingImpl> mappingConverter) {
 
 		final Collection bootValueMapping = (Collection) bootProperty.getValue();
@@ -1583,7 +1585,9 @@ public class MappingModelCreationHelper {
 		}
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	public static ToOneAttributeMapping buildSingularAssociationAttributeMapping(
 			String attrName,
 			NavigableRole navigableRole,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
index 15948d82e6..97dd43e72d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
@@ -73,6 +73,9 @@ public class OneToManyCollectionPart extends AbstractEntityCollectionPart implem
 		}
 	}
 
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected OneToManyCollectionPart(OneToManyCollectionPart original) {
 		super( original );
 		this.mapKeyPropertyName = original.mapKeyPropertyName;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
index a08f233c41..d761564a5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
@@ -193,7 +193,9 @@ public class PluralAttributeMappingImpl
 		injectAttributeMapping( elementDescriptor, indexDescriptor, collectionDescriptor, this );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected PluralAttributeMappingImpl(PluralAttributeMappingImpl original) {
 		super( original );
 		this.propertyAccess = original.propertyAccess;
@@ -476,7 +478,9 @@ public class PluralAttributeMappingImpl
 		}
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected Fetch buildDelayedCollectionFetch(
 			NavigablePath fetchedPath,
 			PluralAttributeMapping fetchedAttribute,
@@ -485,7 +489,9 @@ public class PluralAttributeMappingImpl
 		return new DelayedCollectionFetch( fetchedPath, fetchedAttribute, fetchParent, collectionKeyResult );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected Fetch buildSelectEagerCollectionFetch(
 			NavigablePath fetchedPath,
 			PluralAttributeMapping fetchedAttribute,
@@ -494,7 +500,9 @@ public class PluralAttributeMappingImpl
 		return new SelectEagerCollectionFetch( fetchedPath, fetchedAttribute, collectionKeyDomainResult, fetchParent );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected Fetch buildEagerCollectionFetch(
 			NavigablePath fetchedPath,
 			PluralAttributeMapping fetchedAttribute,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
index ee6b4d01d9..368b13e346 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
@@ -157,7 +157,9 @@ public class ToOneAttributeMapping
 	private String identifyingColumnsTableExpression;
 	private boolean canUseParentTableGroup;
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected ToOneAttributeMapping(ToOneAttributeMapping original) {
 		super( original );
 		navigableRole = original.navigableRole;
@@ -1233,7 +1235,9 @@ public class ToOneAttributeMapping
 		}
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetch buildEntityDelayedFetch(
 			FetchParent fetchParent,
 			ToOneAttributeMapping fetchedAttribute,
@@ -1243,7 +1247,9 @@ public class ToOneAttributeMapping
 		return new EntityDelayedFetchImpl( fetchParent, fetchedAttribute, navigablePath, keyResult, selectByUniqueKey );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetch buildEntityFetchSelect(
 			FetchParent fetchParent,
 			ToOneAttributeMapping fetchedAttribute,
@@ -1261,7 +1267,9 @@ public class ToOneAttributeMapping
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetch buildEntityFetchJoined(
 			FetchParent fetchParent,
 			ToOneAttributeMapping toOneMapping,
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index 38a511927f..c50d2eff5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -1011,13 +1011,17 @@ public abstract class AbstractEntityPersister
 		return rowIdName != null;
 	}
 
-	//used by Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	@SuppressWarnings("unused")
 	public boolean[][] getPropertyColumnUpdateable() {
 		return propertyColumnUpdateable;
 	}
 
-	//used by Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	@SuppressWarnings("unused")
 	public boolean[][] getPropertyColumnInsertable() {
 		return propertyColumnInsertable;
@@ -1580,7 +1584,9 @@ public abstract class AbstractEntityPersister
 		return result;
 	}
 
-	// called by Hibernate Reactive
+	/**
+	 * Called by Hibernate Reactive
+	 */
 	protected boolean initializeLazyProperty(
 			final String fieldName,
 			final Object entity,
@@ -2557,7 +2563,9 @@ public abstract class AbstractEntityPersister
 
 	}
 
-	// used by Hibernate Reactive
+	/**
+	 * Called by Hibernate Reactive
+	 */
 	@SuppressWarnings("unused")
 	protected String[][] getLazyPropertyColumnAliases() {
 		return lazyPropertyColumnAliases;
@@ -5470,7 +5478,9 @@ public abstract class AbstractEntityPersister
 		return null;
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EmbeddedAttributeMapping buildEmbeddedAttributeMapping(
 			String attrName,
 			int stateArrayPosition,
@@ -5502,7 +5512,9 @@ public abstract class AbstractEntityPersister
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected AttributeMapping buildSingularAssociationAttributeMapping(
 			String attrName,
 			NavigableRole navigableRole,
@@ -5530,7 +5542,9 @@ public abstract class AbstractEntityPersister
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected AttributeMapping buildPluralAttributeMapping(
 			String attrName,
 			int stateArrayPosition,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
index 8b0f1bb3aa..d5d234df3f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
@@ -337,7 +337,9 @@ public class TableBasedInsertHandler implements InsertHandler {
 		);
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected ExecutionDelegate buildExecutionDelegate(
 			SqmInsertStatement<?> sqmInsert,
 			MultiTableSqmMutationConverter sqmConverter,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
index 0bf58c8b38..b57559f34f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/UpdateExecutionDelegate.java
@@ -473,7 +473,9 @@ public class UpdateExecutionDelegate implements TableBasedUpdateHandler.Executio
 		return new SqlTuple( expressions, null );
 	}
 
-	// FOr Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 
 	protected TemporaryTable getIdTable() {
 		return idTable;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
index d8e1965909..b3dea9dc6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
@@ -75,7 +75,9 @@ public class EmbeddableFetchImpl extends AbstractFetchParent implements Embeddab
 		afterInitialize( this, creationState );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EmbeddableFetchImpl(EmbeddableFetchImpl original) {
 		super( original.getFetchContainer(), original.getNavigablePath() );
 		fetchParent = original.fetchParent;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
index e0ea73fe45..bf2405dd72 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
@@ -79,7 +79,9 @@ public class EntityFetchJoinedImpl extends AbstractNonLazyEntityFetch {
 		this.entityResult.afterInitialize( this, creationState );
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetchJoinedImpl(EntityFetchJoinedImpl original ) {
 		super( original.getFetchParent(), original.getReferencedModePart(), original.getNavigablePath() );
 		this.entityResult = original.entityResult;
@@ -109,7 +111,9 @@ public class EntityFetchJoinedImpl extends AbstractNonLazyEntityFetch {
 		).asEntityInitializer();
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected Initializer buildEntityJoinedFetchInitializer(
 			EntityResultGraphNode resultDescriptor,
 			EntityValuedFetchable referencedFetchable,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
index b18baff180..09b8c7b226 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
@@ -41,7 +41,9 @@ public class EntityFetchSelectImpl extends AbstractNonJoinedEntityFetch {
 
 	}
 
-	// For Hibernate Reactive
+	/**
+	 * For Hibernate Reactive
+	 */
 	protected EntityFetchSelectImpl(EntityFetchSelectImpl original) {
 		super( original.getNavigablePath(), original.getFetchedMapping(), original.getFetchParent() );
 		this.keyResult = original.keyResult;