diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 0304265957..95142d9004 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -61,7 +61,7 @@ pipeline {
 		label 'Worker&&Containers'
 	}
 	tools {
-		jdk 'OpenJDK 11 Latest'
+		jdk 'OpenJDK 17 Latest'
 	}
 	options {
 		buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
index 69e1ba353f..8bb51d3e7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -234,9 +234,6 @@ public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProc
 				if ( clazz.hasDirectAnnotationUsage( Entity.class ) ) {
 					throw new MappingException( "Only classes (not interfaces) may be mapped as @Entity : " + clazz.getName() );
 				}
-//				if ( clazz.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
-//					throw new MappingException( "Only classes (not interfaces) may be mapped as @MappedSuperclass : " + clazz.getName() );
-//				}
 			}
 			if ( clazz.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
 				if ( debug ) {
diff --git a/migration-guide.adoc b/migration-guide.adoc
index d93a98e579..c9e7eab9b4 100644
--- a/migration-guide.adoc
+++ b/migration-guide.adoc
@@ -182,7 +182,7 @@ must be explicitly set to true.
 [[hbm-transform]]
 == hbm.xml Transformation
 
-Previous versions of Hibernate performed transformations of `hbm.xml` files (with `` enabled)
+Previous versions of Hibernate performed transformations of `hbm.xml` files (with `hibernate.transform_hbm_xml.enabled=true`)
 one file at a time.  This is now done across the entire set of `hbm.xml` files at once.
 While most users will never see this change, it might impact integrations which tie-in to
 XML processing.