diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index fcc4f258bf3b..46d3b56a67a2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -12,6 +12,7 @@
       <option name="WHILE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
       <option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
       <option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
       <option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
diff --git a/docker_db.sh b/docker_db.sh
index f6fcce3a3c29..85538cd6a07a 100755
--- a/docker_db.sh
+++ b/docker_db.sh
@@ -659,8 +659,6 @@ disable_userland_proxy() {
       sudo service docker stop
       echo "Updating /etc/docker/daemon.json..."
       sudo bash -c "export docker_daemon_json='$docker_daemon_json'; echo \"\${docker_daemon_json/\}/,}\\\"userland-proxy\\\": false}\" > /etc/docker/daemon.json"
-      echo "New docker daemon config:"
-      cat /etc/docker/daemon.json
       echo "Starting docker..."
       sudo service docker start
       echo "Service status:"
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
index e28b49c3f3bd..f0ca40a7bacb 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
@@ -63,7 +63,9 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.procedure.internal.DB2CallableStatementSupport;
@@ -87,6 +89,8 @@
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorDB2DatabaseImpl;
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
@@ -96,6 +100,7 @@
 import org.hibernate.type.descriptor.jdbc.CharJdbcType;
 import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.InstantJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalDateJdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalDateTimeJdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalTimeJdbcType;
@@ -154,6 +159,17 @@ public class DB2LegacyDialect extends Dialect {
 			? LegacyDB2LimitHandler.INSTANCE
 			: DB2LimitHandler.INSTANCE;
 	private final UniqueDelegate uniqueDelegate = createUniqueDelegate();
+	private final StandardTableExporter db2TableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isLob() || jdbcType.isXml() ) {
+				// LOB or XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public DB2LegacyDialect() {
 		this( DatabaseVersion.make( 9, 0 ) );
@@ -189,6 +205,11 @@ public DatabaseVersion getDB2Version() {
 		return this.getVersion();
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.db2TableExporter;
+	}
+
 	@Override
 	public int getDefaultStatementBatchSize() {
 		return 0;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
index 7446bf067426..67be120e37a1 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
@@ -53,7 +53,9 @@
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
+import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UserDefinedType;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -81,6 +83,7 @@
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorOracleDatabaseImpl;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.NullType;
@@ -172,6 +175,17 @@ public class OracleLegacyDialect extends Dialect {
 	private final OracleUserDefinedTypeExporter userDefinedTypeExporter = new OracleUserDefinedTypeExporter( this );
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
 	private final SequenceSupport oracleSequenceSupport = OracleSequenceSupport.getInstance(this);
+	private final StandardTableExporter oracleTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( dialect.getVersion().isBefore( 23, 6 ) && jdbcType.isXml() ) {
+				// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.6
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public OracleLegacyDialect() {
 		this( DatabaseVersion.make( 8, 0 ) );
@@ -503,6 +517,8 @@ public String castPattern(CastType from, CastType to) {
 					return "to_timestamp_tz(?1,'YYYY-MM-DD HH24:MI:SS.FF9 TZR')";
 				}
 				break;
+			case XML:
+				return "xmlparse(document ?1)";
 		}
 		return super.castPattern(from, to);
 	}
@@ -1042,6 +1058,11 @@ public SequenceSupport getSequenceSupport() {
 		return oracleSequenceSupport;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return oracleTableExporter;
+	}
+
 	@Override
 	public String getQuerySequencesString() {
 		return "select * from all_sequences";
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
index 73f12a335763..e906643aa946 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
@@ -53,6 +53,8 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.mapping.AggregateColumn;
+import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.procedure.internal.PostgreSQLCallableStatementSupport;
@@ -76,6 +78,8 @@
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
@@ -143,6 +147,17 @@ public class PostgreSQLLegacyDialect extends Dialect {
 
 	protected final PostgreSQLDriverKind driverKind;
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
+	private final StandardTableExporter postgresqlTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// Requires the use of xmltable which is not supported in check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public PostgreSQLLegacyDialect() {
 		this( DatabaseVersion.make( 8, 0 ) );
@@ -1536,6 +1551,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return postgresqlTableExporter;
+	}
+
 	/**
 	 * @return {@code true}, but only because we can "batch" truncate
 	 */
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
index 978cc6a747fe..73911217fbd5 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java
@@ -52,8 +52,10 @@
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.common.FetchClauseType;
 import org.hibernate.query.sqm.IntervalType;
@@ -68,6 +70,7 @@
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.tool.schema.internal.StandardSequenceExporter;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
@@ -142,6 +145,17 @@ public Size resolveSize(
 			}
 		}
 	};
+	private final StandardTableExporter sqlServerTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 
 	public SQLServerLegacyDialect() {
@@ -1165,6 +1179,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.sqlServerTableExporter;
+	}
+
 	@Override
 	public Exporter<Sequence> getSequenceExporter() {
 		if ( exporter == null ) {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java
index 1f91eca53127..a16fbc6d87de 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java
@@ -17,6 +17,8 @@
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SybaseDriverKind;
+import org.hibernate.dialect.aggregate.AggregateSupport;
+import org.hibernate.dialect.aggregate.SybaseASEAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.TopLimitHandler;
@@ -228,6 +230,11 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 		};
 	}
 
+	@Override
+	public AggregateSupport getAggregateSupport() {
+		return SybaseASEAggregateSupport.valueOf( this );
+	}
+
 	/**
 	 * The Sybase ASE {@code BIT} type does not allow
 	 * null values, so we don't use it.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
index 7c0ee8793f8f..aad3ef4fedf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
@@ -93,6 +93,7 @@
 
 import static org.hibernate.cfg.AvailableSettings.JPA_COMPLIANCE;
 import static org.hibernate.cfg.AvailableSettings.WRAPPER_ARRAY_HANDLING;
+import static org.hibernate.cfg.MappingSettings.XML_FORMAT_MAPPER_LEGACY_FORMAT;
 import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 
@@ -652,6 +653,7 @@ public static class MetadataBuildingOptionsImpl
 		private final String schemaCharset;
 		private final boolean xmlMappingEnabled;
 		private final boolean allowExtensionsInCdi;
+		private final boolean xmlFormatMapperLegacyFormat;
 
 		public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 			this.serviceRegistry = serviceRegistry;
@@ -670,6 +672,7 @@ public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 					BOOLEAN,
 					true
 			);
+			xmlFormatMapperLegacyFormat = configService.getSetting( XML_FORMAT_MAPPER_LEGACY_FORMAT, BOOLEAN, false );
 
 			implicitDiscriminatorsForJoinedInheritanceSupported = configService.getSetting(
 					AvailableSettings.IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
@@ -954,6 +957,11 @@ public boolean isAllowExtensionsInCdi() {
 			return allowExtensionsInCdi;
 		}
 
+		@Override
+		public boolean isXmlFormatMapperLegacyFormatEnabled() {
+			return xmlFormatMapperLegacyFormat;
+		}
+
 		/**
 		 * Yuck.  This is needed because JPA lets users define "global building options"
 		 * in {@code orm.xml} mappings.  Forget that there are generally multiple
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
index 17a7c976b955..281a9fe2277a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -169,6 +169,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
 	private Object validatorFactoryReference;
 	private FormatMapper jsonFormatMapper;
 	private FormatMapper xmlFormatMapper;
+	private final boolean xmlFormatMapperLegacyFormatEnabled;
 
 	// SessionFactory behavior
 	private final boolean jpaBootstrap;
@@ -326,7 +327,8 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 		);
 		this.xmlFormatMapper = determineXmlFormatMapper(
 				configurationSettings.get( AvailableSettings.XML_FORMAT_MAPPER ),
-				strategySelector
+				strategySelector,
+				this.xmlFormatMapperLegacyFormatEnabled = context.getMetadataBuildingOptions().isXmlFormatMapperLegacyFormatEnabled()
 		);
 
 		this.sessionFactoryName = (String) configurationSettings.get( SESSION_FACTORY_NAME );
@@ -892,13 +894,13 @@ private static FormatMapper determineJsonFormatMapper(Object setting, StrategySe
 		);
 	}
 
-	private static FormatMapper determineXmlFormatMapper(Object setting, StrategySelector strategySelector) {
+	private static FormatMapper determineXmlFormatMapper(Object setting, StrategySelector strategySelector, boolean legacyFormat) {
 		return strategySelector.resolveDefaultableStrategy(
 				FormatMapper.class,
 				setting,
 				(Callable<FormatMapper>) () -> {
-					final FormatMapper jacksonFormatMapper = getXMLJacksonFormatMapperOrNull();
-					return jacksonFormatMapper != null ? jacksonFormatMapper : new JaxbXmlFormatMapper();
+					final FormatMapper jacksonFormatMapper = getXMLJacksonFormatMapperOrNull( legacyFormat );
+					return jacksonFormatMapper != null ? jacksonFormatMapper : new JaxbXmlFormatMapper( legacyFormat );
 				}
 		);
 	}
@@ -1358,6 +1360,11 @@ public FormatMapper getXmlFormatMapper() {
 		return xmlFormatMapper;
 	}
 
+	@Override
+	public boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return xmlFormatMapperLegacyFormatEnabled;
+	}
+
 	@Override
 	public boolean isPassProcedureParameterNames() {
 		return passProcedureParameterNames;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
index 2db486b4c15d..83174af07d78 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
@@ -182,4 +182,9 @@ public boolean isXmlMappingEnabled() {
 	public boolean isAllowExtensionsInCdi() {
 		return delegate.isAllowExtensionsInCdi();
 	}
+
+	@Override
+	public boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return delegate.isXmlFormatMapperLegacyFormatEnabled();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
index 85461af84dc7..15e912a7698e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
@@ -523,6 +523,11 @@ public FormatMapper getXmlFormatMapper() {
 		return delegate.getXmlFormatMapper();
 	}
 
+	@Override
+	public boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return delegate.isXmlFormatMapperLegacyFormatEnabled();
+	}
+
 	@Override
 	public boolean isPassProcedureParameterNames() {
 		return delegate.isPassProcedureParameterNames();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
index 560f08854b1d..17780981b433 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
@@ -6,6 +6,7 @@
 
 import java.util.List;
 
+import org.hibernate.Incubating;
 import org.hibernate.TimeZoneStorageStrategy;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
@@ -144,6 +145,15 @@ default CollectionSemanticsResolver getPersistentCollectionRepresentationResolve
 	 */
 	boolean isMultiTenancyEnabled();
 
+	/**
+	 * Whether to use the legacy format for serializing/deserializing XML data.
+	 *
+	 * @since 7.0
+	 * @see org.hibernate.cfg.MappingSettings#XML_FORMAT_MAPPER_LEGACY_FORMAT
+	 */
+	@Incubating
+	boolean isXmlFormatMapperLegacyFormatEnabled();
+
 	/**
 	 * @return the {@link TypeConfiguration} belonging to the {@link BootstrapContext}
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
index 949f7bd2ce47..39a5c463c9c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
@@ -571,6 +571,15 @@ default boolean isCollectionsInDefaultFetchGroupEnabled() {
 	@Incubating
 	FormatMapper getXmlFormatMapper();
 
+	/**
+	 * Whether to use the legacy format for serializing/deserializing XML data.
+	 *
+	 * @since 7.0
+	 * @see org.hibernate.cfg.MappingSettings#XML_FORMAT_MAPPER_LEGACY_FORMAT
+	 */
+	@Incubating
+	boolean isXmlFormatMapperLegacyFormatEnabled();
+
 	/**
 	 * The default tenant identifier java type to use, in case no explicit tenant identifier property is defined.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
index fd9c78b74117..cc2701d46c83 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
@@ -325,6 +325,17 @@ public interface MappingSettings {
 	@Incubating
 	String XML_FORMAT_MAPPER = "hibernate.type.xml_format_mapper";
 
+	/**
+	 * Specifies whether to use the legacy provider specific and non-portable XML format for collections and byte arrays
+	 * for XML serialization/deserialization.
+	 * <p>
+	 * {@code false} by default. This property only exists for backwards compatibility.
+	 *
+	 * @since 7.0
+	 */
+	@Incubating
+	String XML_FORMAT_MAPPER_LEGACY_FORMAT = "hibernate.type.xml_format_mapper.legacy_format";
+
 	/**
 	 * Configurable control over how to handle {@code Byte[]} and {@code Character[]} types
 	 * encountered in the application domain model.  Allowable semantics are defined by
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
index c6b2dfde742f..d4541f5f829c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -53,7 +53,9 @@
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.procedure.internal.DB2CallableStatementSupport;
@@ -77,6 +79,8 @@
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorDB2DatabaseImpl;
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
@@ -84,6 +88,7 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.InstantJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalDateJdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalDateTimeJdbcType;
 import org.hibernate.type.descriptor.jdbc.LocalTimeJdbcType;
@@ -146,6 +151,17 @@ public class DB2Dialect extends Dialect {
 			? LegacyDB2LimitHandler.INSTANCE
 			: DB2LimitHandler.INSTANCE;
 	private final UniqueDelegate uniqueDelegate = createUniqueDelegate();
+	private final StandardTableExporter db2TableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isLob() || jdbcType.isXml() ) {
+				// LOB or XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public DB2Dialect() {
 		this( MINIMUM_VERSION );
@@ -171,6 +187,11 @@ public DatabaseVersion getDB2Version() {
 		return this.getVersion();
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.db2TableExporter;
+	}
+
 	@Override
 	public int getDefaultStatementBatchSize() {
 		return 0;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
index b40b88efbef8..0ed3854cbad5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2JsonJdbcType.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -31,6 +32,11 @@ protected H2JsonJdbcType(EmbeddableMappingType embeddableMappingType) {
 		super( embeddableMappingType );
 	}
 
+	@Override
+	public int getJdbcTypeCode() {
+		return SqlTypes.VARBINARY;
+	}
+
 	@Override
 	public String toString() {
 		return "H2JsonJdbcType";
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
index 6fc4b21a4cd3..42c87f77cf73 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
@@ -111,7 +111,6 @@ private static void toString(
 			Object domainValue,
 			char separator) {
 		final Object[] values = embeddableMappingType.getValues( domainValue );
-		final int numberOfAttributes = embeddableMappingType.getNumberOfAttributeMappings();
 		for ( int i = 0; i < values.length; i++ ) {
 			final ValuedModelPart attributeMapping = getEmbeddedPart( embeddableMappingType, i );
 			if ( attributeMapping instanceof SelectableMapping ) {
@@ -312,13 +311,7 @@ private static void convertedBasicValueToString(
 			case SqlTypes.MATERIALIZED_BLOB:
 				// These types need to be serialized as JSON string, and for efficiency uses appendString directly
 				appender.append( '"' );
-				appender.write(
-						javaType.unwrap(
-								value,
-								byte[].class,
-								options
-						)
-				);
+				appender.write( javaType.unwrap( value, byte[].class, options ) );
 				appender.append( '"' );
 				break;
 			case SqlTypes.ARRAY:
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
index da66ea545d2b..6a6e02774434 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleArrayJdbcType.java
@@ -253,6 +253,7 @@ private void createUserDefinedArrayType(
 		userDefinedArrayType.setArraySqlTypeCode( getDdlTypeCode() );
 		userDefinedArrayType.setElementTypeName( elementTypeName );
 		userDefinedArrayType.setElementSqlTypeCode( elementJdbcType.getDefaultSqlTypeCode() );
+		userDefinedArrayType.setElementDdlTypeCode( elementJdbcType.getDdlTypeCode() );
 		userDefinedArrayType.setArrayLength( columnSize.getArrayLength() == null ? 127 : columnSize.getArrayLength() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
index 47a97d600962..9f5575a32056 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -47,6 +47,8 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.mapping.AggregateColumn;
+import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UserDefinedType;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -78,6 +80,7 @@
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorOracleDatabaseImpl;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.NullType;
@@ -181,6 +184,17 @@ public class OracleDialect extends Dialect {
 	private final OracleUserDefinedTypeExporter userDefinedTypeExporter = new OracleUserDefinedTypeExporter( this );
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
 	private final SequenceSupport oracleSequenceSupport = OracleSequenceSupport.getInstance(this);
+	private final StandardTableExporter oracleTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( dialect.getVersion().isBefore( 23, 6 ) && jdbcType.isXml() ) {
+				// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.6
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	// Is it an Autonomous Database Cloud Service?
 	protected final boolean autonomous;
@@ -589,6 +603,8 @@ public String castPattern(CastType from, CastType to) {
 					return "to_timestamp_tz(?1,'YYYY-MM-DD HH24:MI:SS.FF9 TZR')";
 				}
 				break;
+			case XML:
+				return "xmlparse(document ?1)";
 		}
 		return super.castPattern(from, to);
 	}
@@ -988,6 +1004,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 			typeContributions.contributeJdbcType( OracleBooleanJdbcType.INSTANCE );
 		}
 		typeContributions.contributeJdbcType( OracleXmlJdbcType.INSTANCE );
+		typeContributions.contributeJdbcTypeConstructor( OracleXmlArrayJdbcTypeConstructor.INSTANCE );
 		if ( OracleJdbcHelper.isUsable( serviceRegistry ) ) {
 			typeContributions.contributeJdbcType( OracleJdbcHelper.getStructJdbcType( serviceRegistry ) );
 		}
@@ -1132,6 +1149,11 @@ public SequenceSupport getSequenceSupport() {
 		return oracleSequenceSupport;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return oracleTableExporter;
+	}
+
 	@Override
 	public String getQuerySequencesString() {
 		return "select * from all_sequences";
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonArrayJdbcType.java
index aac07cb6fa3e..a722c61d2b45 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleJsonArrayJdbcType.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect;
 
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -20,6 +21,11 @@ public OracleJsonArrayJdbcType(JdbcType elementJdbcType) {
 		super( elementJdbcType );
 	}
 
+	@Override
+	public int getDdlTypeCode() {
+		return SqlTypes.JSON;
+	}
+
 	@Override
 	public String toString() {
 		return "OracleJsonJdbcType";
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
index 6b6325454101..5f6441b1e52f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.dialect;
 
-import java.util.Locale;
-
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.QualifiedName;
@@ -16,18 +14,16 @@
 import org.hibernate.type.SqlTypes;
 
 import static java.sql.Types.BOOLEAN;
-import static org.hibernate.type.SqlTypes.BIGINT;
 import static org.hibernate.type.SqlTypes.BINARY;
+import static org.hibernate.type.SqlTypes.BIT;
+import static org.hibernate.type.SqlTypes.BLOB;
 import static org.hibernate.type.SqlTypes.DATE;
-import static org.hibernate.type.SqlTypes.INTEGER;
 import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
-import static org.hibernate.type.SqlTypes.SMALLINT;
 import static org.hibernate.type.SqlTypes.TABLE;
 import static org.hibernate.type.SqlTypes.TIME;
 import static org.hibernate.type.SqlTypes.TIMESTAMP;
 import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
 import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
-import static org.hibernate.type.SqlTypes.TINYINT;
 import static org.hibernate.type.SqlTypes.UUID;
 import static org.hibernate.type.SqlTypes.VARBINARY;
 
@@ -61,11 +57,13 @@ public String[] getSqlCreateStrings(
 		}
 		final int arrayLength = userDefinedType.getArrayLength();
 		final Integer elementSqlTypeCode = userDefinedType.getElementSqlTypeCode();
+		final Integer elementDdlTypeCode = userDefinedType.getElementDdlTypeCode();
 		final String jsonTypeName = metadata.getDatabase().getTypeConfiguration().getDdlTypeRegistry().getTypeName(
 				SqlTypes.JSON,
 				dialect
 		);
-		final String valueExpression = determineValueExpression( "t.value", elementSqlTypeCode, elementType );
+		final String valueExpression = determineValueExpression( "t.value", elementSqlTypeCode, elementDdlTypeCode, elementType );
+		final String jsonElementType = determineJsonElementType( elementSqlTypeCode, elementDdlTypeCode, elementType );
 		return new String[] {
 				"create or replace type " + arrayTypeName + " as varying array(" + arrayLength + ") of " + elementType,
 				"create or replace function " + arrayTypeName + "_cmp(a in " + arrayTypeName +
@@ -266,7 +264,7 @@ public String[] getSqlCreateStrings(
 						"res " + arrayTypeName + ":=" + arrayTypeName + "(); begin " +
 						"if arr is null then return null; end if; " +
 						"select " + valueExpression + " bulk collect into res " +
-						"from json_table(arr,'$[*]' columns (value path '$')) t; " +
+						"from json_table(arr,'$[*]' columns (value " + jsonElementType + " path '$')) t; " +
 						"return res; " +
 						"end;"
 		};
@@ -332,17 +330,8 @@ private boolean supportsIfExistsBeforeFunctionName() {
 		return dialect.getVersion().isSameOrAfter( 23 );
 	}
 
-	private String determineValueExpression(String expression, int elementSqlTypeCode, String elementType) {
+	private String determineValueExpression(String expression, int elementSqlTypeCode, Integer elementDdlTypeCode, String elementType) {
 		switch ( elementSqlTypeCode ) {
-			case BOOLEAN:
-				if ( elementType.toLowerCase( Locale.ROOT ).trim().startsWith( "number" ) ) {
-					return "decode(" + expression + ",'true',1,'false',0,null)";
-				}
-			case TINYINT:
-			case SMALLINT:
-			case INTEGER:
-			case BIGINT:
-				return "cast(" + expression + " as " + elementType + ")";
 			case DATE:
 				return "to_date(" + expression + ",'YYYY-MM-DD')";
 			case TIME:
@@ -355,14 +344,47 @@ private String determineValueExpression(String expression, int elementSqlTypeCod
 			case BINARY:
 			case VARBINARY:
 			case LONG32VARBINARY:
-				return "hextoraw(" + expression + ")";
+			case BLOB:
+				return "xmlcast(xmlcdata(" + expression + ") as " + elementType + ")";
 			case UUID:
 				return "hextoraw(replace(" + expression + ",'-',''))";
+			case BIT:
+				return "decode(" + expression + ",'true',1,'false',0,null)";
+			case BOOLEAN:
+				if ( SqlTypes.isNumericType( elementDdlTypeCode ) ) {
+					return "decode(" + expression + ",'true',1,'false',0,null)";
+				}
+				// Fall-through intended
 			default:
 				return expression;
 		}
 	}
 
+	private String determineJsonElementType(Integer elementSqlTypeCode, Integer elementDdlTypeCode, String elementType) {
+		switch ( elementSqlTypeCode ) {
+			case BINARY:
+			case VARBINARY:
+			case LONG32VARBINARY:
+			case BLOB:
+				return "clob";
+			case BOOLEAN:
+				if ( !SqlTypes.isNumericType( elementDdlTypeCode ) ) {
+					return elementType;
+				}
+				// Fall-through intended
+			case BIT:
+			case DATE:
+			case TIME:
+			case TIMESTAMP:
+			case TIMESTAMP_WITH_TIMEZONE:
+			case TIMESTAMP_UTC:
+			case UUID:
+				return "varchar2(4000)";
+			default:
+				return elementType;
+		}
+	}
+
 	protected String createOrReplaceConcatFunction(String arrayTypeName) {
 		// Since Oracle has no builtin concat function for varrays and doesn't support varargs,
 		// we have to create a function with a fixed amount of arguments with default that fits "most" cases.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcType.java
new file mode 100644
index 000000000000..fae141abca01
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcType.java
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.XmlArrayJdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * @author Christian Beikov
+ */
+public class OracleXmlArrayJdbcType extends XmlArrayJdbcType {
+
+	public OracleXmlArrayJdbcType(JdbcType elementJdbcType) {
+		super( elementJdbcType );
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		// Seems the Oracle JDBC driver doesn't support `setNull(index, Types.SQLXML)`
+		// but it seems that the following works fine
+		return new XmlArrayBinder<>( javaType, this ) {
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, Types.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options) throws SQLException {
+				st.setNull( name, Types.VARCHAR );
+			}
+		};
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcTypeConstructor.java
new file mode 100644
index 000000000000..c6300dba5f6a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleXmlArrayJdbcTypeConstructor.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeConstructor;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Factory for {@link OracleXmlArrayJdbcType}.
+ */
+public class OracleXmlArrayJdbcTypeConstructor implements JdbcTypeConstructor {
+
+	public static final OracleXmlArrayJdbcTypeConstructor INSTANCE = new OracleXmlArrayJdbcTypeConstructor();
+
+	@Override
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			BasicType<?> elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return resolveType( typeConfiguration, dialect, elementType.getJdbcType(), columnTypeInformation );
+	}
+
+	@Override
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			JdbcType elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return new OracleXmlArrayJdbcType( elementType );
+	}
+
+	@Override
+	public int getDefaultSqlTypeCode() {
+		return SqlTypes.XML_ARRAY;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
index a46cd1331117..3707cee2bcf9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -50,6 +50,8 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.mapping.AggregateColumn;
+import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
@@ -78,6 +80,8 @@
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.sql.model.jdbc.OptionalTableUpdateOperation;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
@@ -145,6 +149,17 @@ public class PostgreSQLDialect extends Dialect {
 	protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 12 );
 
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
+	private final StandardTableExporter postgresqlTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// Requires the use of xmltable which is not supported in check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	protected final PostgreSQLDriverKind driverKind;
 	private final OptionalTableUpdateStrategy optionalTableUpdateStrategy;
@@ -1474,6 +1489,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return postgresqlTableExporter;
+	}
+
 	/**
 	 * @return {@code true}, but only because we can "batch" truncate
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
index 8d4a950b621d..c0480ddd415c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -54,8 +54,10 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.procedure.internal.SQLServerCallableStatementSupport;
 import org.hibernate.procedure.spi.CallableStatementSupport;
@@ -75,6 +77,7 @@
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.tool.schema.internal.StandardSequenceExporter;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
@@ -161,6 +164,17 @@ public Size resolveSize(
 			};
 		}
 	};
+	private final StandardTableExporter sqlServerTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public SQLServerDialect() {
 		this( MINIMUM_VERSION );
@@ -1109,6 +1123,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.sqlServerTableExporter;
+	}
+
 	@Override
 	public Exporter<Sequence> getSequenceExporter() {
 		return exporter == null ? super.getSequenceExporter() : exporter;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
index deb1f874ee08..fd5f89646dfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
@@ -15,6 +15,8 @@
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.dialect.aggregate.AggregateSupport;
+import org.hibernate.dialect.aggregate.SybaseASEAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.TopLimitHandler;
@@ -252,6 +254,11 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 		};
 	}
 
+	@Override
+	public AggregateSupport getAggregateSupport() {
+		return SybaseASEAggregateSupport.valueOf( this );
+	}
+
 	/**
 	 * The Sybase ASE {@code BIT} type does not allow
 	 * null values, so we don't use it.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
index 34825926c40f..178932707ed7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/XmlHelper.java
@@ -5,15 +5,16 @@
 package org.hibernate.dialect;
 
 
-import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.reflect.Array;
 import java.sql.SQLException;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Base64;
+import java.util.Collections;
 import java.util.List;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Internal;
 import org.hibernate.engine.spi.LazySessionWrapperOptions;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -24,16 +25,22 @@
 import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
-import org.hibernate.type.descriptor.java.IntegerJavaType;
+import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.JdbcDateJavaType;
 import org.hibernate.type.descriptor.java.JdbcTimeJavaType;
 import org.hibernate.type.descriptor.java.JdbcTimestampJavaType;
 import org.hibernate.type.descriptor.java.OffsetDateTimeJavaType;
+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.XmlArrayJdbcType;
 
 import static java.lang.Character.isLetter;
 import static java.lang.Character.isLetterOrDigit;
@@ -52,37 +59,10 @@ public class XmlHelper {
 	public static final String ROOT_TAG = "e";
 	private static final String START_TAG = "<" + ROOT_TAG + ">";
 	private static final String END_TAG = "</" + ROOT_TAG + ">";
-
-	private static Object fromEscapedString(
-			JdbcMapping jdbcMapping,
-			String string,
-			int start,
-			int end) {
-		final String unescaped = unescape( string, start, end );
-		return fromString( jdbcMapping, unescaped, 0, unescaped.length() );
-	}
-
-	private static Object fromString(
-			JdbcMapping jdbcMapping,
-			String string,
-			int start,
-			int end) {
-		return jdbcMapping.getJdbcJavaType().fromEncodedString(
-				string,
-				start,
-				end
-		);
-	}
-
-	private static Object fromRawObject(
-			JdbcMapping jdbcMapping,
-			Object raw,
-			WrapperOptions options) {
-		return jdbcMapping.getJdbcJavaType().wrap(
-				raw,
-				options
-		);
-	}
+	private static final String NULL_TAG = "<" + ROOT_TAG + "/>";
+	private static final String COLLECTION_START_TAG = "<Collection>";
+	private static final String COLLECTION_END_TAG = "</Collection>";
+	private static final String EMPTY_COLLECTION_TAG = "<Collection/>";
 
 	private static String unescape(String string, int start, int end) {
 		final StringBuilder sb = new StringBuilder( end - start );
@@ -111,6 +91,14 @@ private static String unescape(String string, int start, int end) {
 									sb.append( '&' );
 									i += 4;
 								}
+								else if ( i + 5 < end
+									&& string.charAt( i + 2 ) == 'p'
+									&& string.charAt( i + 3 ) == 'o'
+									&& string.charAt( i + 4 ) == 's'
+									&& string.charAt( i + 5 ) == ';' ) {
+									sb.append( '\'' );
+									i += 5;
+								}
 								break OUTER;
 							case 'g':
 								if ( string.charAt( i + 2 ) == 't' && string.charAt( i + 3 ) == ';' ) {
@@ -118,6 +106,16 @@ private static String unescape(String string, int start, int end) {
 									i += 3;
 								}
 								break OUTER;
+							case 'q':
+								if ( i + 5 < end
+									&& string.charAt( i + 2 ) == 'u'
+									&& string.charAt( i + 3 ) == 'o'
+									&& string.charAt( i + 4 ) == 't'
+									&& string.charAt( i + 5 ) == ';' ) {
+									sb.append( '"' );
+									i += 5;
+								}
+								break OUTER;
 						}
 					}
 					throw new IllegalArgumentException( "Illegal XML content: " + string.substring( start, end ) );
@@ -132,37 +130,59 @@ private static String unescape(String string, int start, int end) {
 	private static Object fromString(
 			EmbeddableMappingType embeddableMappingType,
 			String string,
+			boolean returnEmbeddable,
 			WrapperOptions options,
 			int selectableIndex,
 			int start,
-			int end) {
-		final JdbcMapping jdbcMapping = embeddableMappingType.getJdbcValueSelectable( selectableIndex ).getJdbcMapping();
-		switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
-			case SqlTypes.BOOLEAN:
-			case SqlTypes.BIT:
+			int end) throws SQLException {
+		final JdbcMapping jdbcMapping = embeddableMappingType.getJdbcValueSelectable( selectableIndex )
+				.getJdbcMapping();
+		return fromString(
+				jdbcMapping.getMappedJavaType(),
+				jdbcMapping.getJdbcJavaType(),
+				jdbcMapping.getJdbcType(),
+				string,
+				returnEmbeddable,
+				options,
+				start,
+				end
+		);
+	}
+
+	private static Object fromString(
+			JavaType<?> javaType,
+			JavaType<?> jdbcJavaType,
+			JdbcType jdbcType,
+			String string,
+			boolean returnEmbeddable,
+			WrapperOptions options,
+			int start,
+			int end) throws SQLException {
+		switch ( jdbcType.getDefaultSqlTypeCode() ) {
 			case SqlTypes.TINYINT:
 			case SqlTypes.SMALLINT:
 			case SqlTypes.INTEGER:
+				if ( jdbcJavaType.getJavaTypeClass() == Boolean.class ) {
+					return jdbcJavaType.wrap( Integer.parseInt( string, start, end, 10 ), options );
+				}
+				else if ( jdbcJavaType instanceof EnumJavaType<?> ) {
+					return jdbcJavaType.wrap( Integer.parseInt( string, start, end, 10 ), options );
+				}
+			case SqlTypes.BOOLEAN:
+			case SqlTypes.BIT:
 			case SqlTypes.BIGINT:
 			case SqlTypes.FLOAT:
 			case SqlTypes.REAL:
 			case SqlTypes.DOUBLE:
 			case SqlTypes.DECIMAL:
 			case SqlTypes.NUMERIC:
-				Class<?> javaTypeClass = jdbcMapping.getMappedJavaType().getJavaTypeClass();
-				if ( javaTypeClass.isEnum() ) {
-					return javaTypeClass.getEnumConstants()
-							[IntegerJavaType.INSTANCE.fromEncodedString( string, start, end )];
-				}
-				return fromString(
-						jdbcMapping,
+				return jdbcJavaType.fromEncodedString(
 						string,
 						start,
 						end
 				);
 			case SqlTypes.DATE:
-				return fromRawObject(
-						jdbcMapping,
+				return jdbcJavaType.wrap(
 						JdbcDateJavaType.INSTANCE.fromEncodedString(
 								string,
 								start,
@@ -173,8 +193,7 @@ private static Object fromString(
 			case SqlTypes.TIME:
 			case SqlTypes.TIME_WITH_TIMEZONE:
 			case SqlTypes.TIME_UTC:
-				return fromRawObject(
-						jdbcMapping,
+				return jdbcJavaType.wrap(
 						JdbcTimeJavaType.INSTANCE.fromEncodedString(
 								string,
 								start,
@@ -183,8 +202,7 @@ private static Object fromString(
 						options
 				);
 			case SqlTypes.TIMESTAMP:
-				return fromRawObject(
-						jdbcMapping,
+				return jdbcJavaType.wrap(
 						JdbcTimestampJavaType.INSTANCE.fromEncodedString(
 								string,
 								start,
@@ -194,8 +212,7 @@ private static Object fromString(
 				);
 			case SqlTypes.TIMESTAMP_WITH_TIMEZONE:
 			case SqlTypes.TIMESTAMP_UTC:
-				return fromRawObject(
-						jdbcMapping,
+				return jdbcJavaType.wrap(
 						OffsetDateTimeJavaType.INSTANCE.fromEncodedString(
 								string,
 								start,
@@ -207,19 +224,53 @@ private static Object fromString(
 			case SqlTypes.VARBINARY:
 			case SqlTypes.LONGVARBINARY:
 			case SqlTypes.LONG32VARBINARY:
+			case SqlTypes.BLOB:
+			case SqlTypes.MATERIALIZED_BLOB:
+				return jdbcJavaType.wrap(
+						PrimitiveByteArrayJavaType.INSTANCE.fromEncodedString(
+								string,
+								start,
+								end
+						),
+						options
+				);
 			case SqlTypes.UUID:
-				return fromRawObject(
-						jdbcMapping,
-						Base64.getDecoder().decode( string.substring( start, end ) ),
+				return jdbcJavaType.wrap(
+						PrimitiveByteArrayJavaType.INSTANCE.fromString(
+								string.substring( start, end ).replace( "-", "" )
+						),
 						options
 				);
+			case SqlTypes.CHAR:
+			case SqlTypes.NCHAR:
+			case SqlTypes.VARCHAR:
+			case SqlTypes.NVARCHAR:
+				if ( jdbcJavaType.getJavaTypeClass() == Boolean.class && end == start + 1 ) {
+					return jdbcJavaType.wrap( string.charAt( start ), options );
+				}
 			default:
-				return fromEscapedString(
-						jdbcMapping,
-						string,
-						start,
-						end
-				);
+				if ( jdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+					final Object[] subValues = aggregateJdbcType.extractJdbcValues(
+							CharSequenceHelper.subSequence(
+									string,
+									start,
+									end
+							),
+							options
+					);
+					if ( returnEmbeddable ) {
+						final StructAttributeValues subAttributeValues = StructHelper.getAttributeValues(
+								aggregateJdbcType.getEmbeddableMappingType(),
+								subValues,
+								options
+						);
+						final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+						return instantiate( embeddableMappingType, subAttributeValues, options.getSessionFactory() ) ;
+					}
+					return subValues;
+				}
+				final String unescaped = unescape( string, start, end );
+				return jdbcJavaType.fromEncodedString( unescaped, 0, unescaped.length() );
 		}
 	}
 
@@ -228,8 +279,18 @@ public static <X> X fromString(
 			String string,
 			boolean returnEmbeddable,
 			WrapperOptions options) throws SQLException {
-		if ( !string.startsWith( START_TAG ) || !string.endsWith( END_TAG ) ) {
-			throw new IllegalArgumentException( "Illegal XML for struct: " + string );
+		if ( NULL_TAG.equals( string ) ) {
+			return null;
+		}
+		int contentEnd = string.length() - 1;
+		while ( contentEnd >= 0 ) {
+			if ( !Character.isWhitespace( string.charAt( contentEnd ) ) ) {
+				break;
+			}
+			contentEnd--;
+		}
+		if ( !string.startsWith( START_TAG ) || !string.regionMatches( contentEnd - END_TAG.length()+ 1, END_TAG, 0, END_TAG.length() ) ) {
+			throw new IllegalArgumentException( "XML not properly formatted: " + string );
 		}
 		int end;
 		final Object[] array;
@@ -243,7 +304,7 @@ public static <X> X fromString(
 			array = new Object[embeddableMappingType.getJdbcValueCount() + ( embeddableMappingType.isPolymorphic() ? 1 : 0 )];
 			end = fromString( embeddableMappingType, string, returnEmbeddable, options, array, START_TAG.length() );
 		}
-		assert end + END_TAG.length() == string.length();
+		assert end + END_TAG.length() == contentEnd + 1;
 
 		if ( returnEmbeddable ) {
 			final StructAttributeValues attributeValues = StructHelper.getAttributeValues( embeddableMappingType, array, options );
@@ -254,6 +315,45 @@ public static <X> X fromString(
 		return (X) array;
 	}
 
+	public static <X> X arrayFromString(
+			JavaType<X> javaType,
+			XmlArrayJdbcType xmlArrayJdbcType,
+			String string,
+			WrapperOptions options) throws SQLException {
+		if ( string == null ) {
+			return null;
+		}
+		else if ( EMPTY_COLLECTION_TAG.equals( string ) ) {
+			return javaType.wrap( Collections.emptyList(), options );
+		}
+		else if ( !string.startsWith( COLLECTION_START_TAG ) || !string.endsWith( COLLECTION_END_TAG ) ) {
+			throw new IllegalArgumentException( "Illegal XML for array: " + string );
+		}
+		final JavaType<?> elementJavaType = ((BasicPluralJavaType<?>) javaType).getElementJavaType();
+		final Class<?> preferredJavaTypeClass = xmlArrayJdbcType.getElementJdbcType().getPreferredJavaTypeClass( options );
+		final JavaType<?> jdbcJavaType;
+		if ( preferredJavaTypeClass == null || preferredJavaTypeClass == elementJavaType.getJavaTypeClass() ) {
+			jdbcJavaType = elementJavaType;
+		}
+		else {
+			jdbcJavaType = options.getSessionFactory().getTypeConfiguration().getJavaTypeRegistry()
+					.resolveDescriptor( preferredJavaTypeClass );
+		}
+		final ArrayList<Object> arrayList = new ArrayList<>();
+		final int end = fromArrayString(
+				string,
+				false,
+				options,
+				COLLECTION_START_TAG.length(),
+				arrayList,
+				elementJavaType,
+				jdbcJavaType,
+				xmlArrayJdbcType.getElementJdbcType()
+		);
+		assert end + COLLECTION_END_TAG.length() == string.length();
+		return javaType.wrap( arrayList, options );
+	}
+
 	private static int fromString(
 			String string,
 			List<Object> values,
@@ -365,6 +465,7 @@ private static int fromString(
 							values[selectableMapping] = fromString(
 									embeddableMappingType,
 									string,
+									returnEmbeddable,
 									options,
 									selectableMapping,
 									contentStart,
@@ -377,63 +478,86 @@ private static int fromString(
 							final SelectableMapping selectable = embeddableMappingType.getJdbcValueSelectable(
 									selectableIndex
 							);
-							if ( !( selectable.getJdbcMapping().getJdbcType() instanceof AggregateJdbcType ) ) {
-								throw new IllegalArgumentException(
-										String.format(
-												"XML starts sub-object for a non-aggregate type at index %d. Selectable [%s] is of type [%s]",
-												i,
-												selectable.getSelectableName(),
-												selectable.getJdbcMapping().getJdbcType().getClass().getName()
-										)
-								);
+							final JdbcType jdbcType = selectable.getJdbcMapping().getJdbcType();
+							if ( jdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+								final EmbeddableMappingType subMappingType = aggregateJdbcType.getEmbeddableMappingType();
+								final Object[] subValues;
+								final int end;
+								if ( aggregateJdbcType.getJdbcTypeCode() == SqlTypes.SQLXML || aggregateJdbcType.getDefaultSqlTypeCode() == SqlTypes.SQLXML ) {
+									// If we stay in XML land, we can recurse instead
+									subValues = new Object[subMappingType.getJdbcValueCount()];
+									end = fromString(
+											subMappingType,
+											string,
+											returnEmbeddable,
+											options,
+											subValues,
+											i
+									);
+								}
+								else {
+									// Determine the end of the XML element
+									while ( string.charAt( i ) != '<' ) {
+										i++;
+									}
+									end = i;
+									subValues = aggregateJdbcType.extractJdbcValues(
+											CharSequenceHelper.subSequence(
+													string,
+													start,
+													end
+											),
+											options
+									);
+								}
+								if ( returnEmbeddable ) {
+									final StructAttributeValues attributeValues = StructHelper.getAttributeValues(
+											subMappingType,
+											subValues,
+											options
+									);
+									values[selectableIndex] = instantiate( subMappingType, attributeValues,
+											options.getSessionFactory() );
+								}
+								else {
+									values[selectableIndex] = subValues;
+								}
+								// The end is the start angle bracket for the end tag
+								assert string.charAt( end ) == '<';
+								assert string.charAt( end + 1 ) == '/';
+								assert string.regionMatches( end + 2, tagName, 0, tagName.length() );
+								i = end;
 							}
-							final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) selectable.getJdbcMapping().getJdbcType();
-							final EmbeddableMappingType subMappingType = aggregateJdbcType.getEmbeddableMappingType();
-							final Object[] subValues;
-							final int end;
-							if ( aggregateJdbcType.getJdbcTypeCode() == SqlTypes.SQLXML || aggregateJdbcType.getDefaultSqlTypeCode() == SqlTypes.SQLXML ) {
-								// If we stay in XML land, we can recurse instead
-								subValues = new Object[subMappingType.getJdbcValueCount()];
-								end = fromString(
-										subMappingType,
+							else if ( selectable.getJdbcMapping() instanceof BasicPluralType<?,?> pluralType ) {
+								final BasicType<?> elementType = pluralType.getElementType();
+								final ArrayList<Object> arrayList = new ArrayList<>();
+								final int end = fromArrayString(
 										string,
 										returnEmbeddable,
 										options,
-										subValues,
-										i
+										i,
+										arrayList,
+										elementType.getMappedJavaType(),
+										elementType.getJdbcJavaType(),
+										elementType.getJdbcType()
 								);
+								values[selectableIndex] = selectable.getJdbcMapping().getJdbcJavaType().wrap( arrayList, options );
+								// The end is the start angle bracket for the end tag
+								assert string.charAt( end ) == '<';
+								assert string.charAt( end + 1 ) == '/';
+								assert string.regionMatches( end + 2, tagName, 0, tagName.length() );
+								i = end;
 							}
 							else {
-								// Determine the end of the XML element
-								while ( string.charAt( i ) != '<' ) {
-									i++;
-								}
-								end = i;
-								subValues = aggregateJdbcType.extractJdbcValues(
-										CharSequenceHelper.subSequence(
-												string,
-												start,
-												end
-										),
-										options
-								);
-							}
-							if ( returnEmbeddable ) {
-								final StructAttributeValues attributeValues = StructHelper.getAttributeValues(
-										subMappingType,
-										subValues,
-										options
+								throw new IllegalArgumentException(
+										String.format(
+												"XML starts sub-object for a non-aggregate type at index %d. Selectable [%s] is of type [%s]",
+												i,
+												selectable.getSelectableName(),
+												jdbcType.getClass().getName()
+										)
 								);
-								values[selectableIndex] = instantiate( subMappingType, attributeValues, options.getSessionFactory() );
-							}
-							else {
-								values[selectableIndex] = subValues;
 							}
-							// The end is the start angle bracket for the end tag
-							assert string.charAt( end ) == '<';
-							assert string.charAt( end + 1 ) == '/';
-							assert string.regionMatches( end + 2, tagName, 0, tagName.length() );
-							i = end;
 						}
 						// consume the whole closing tag
 						i += tagName.length() + 2;
@@ -474,86 +598,240 @@ private static int fromString(
 		throw new IllegalArgumentException( "XML not properly formed: " + string.substring( start ) );
 	}
 
+	private static int fromArrayString(
+			String string,
+			boolean returnEmbeddable,
+			WrapperOptions options,
+			int start,
+			ArrayList<Object> arrayList,
+			JavaType<?> javaType,
+			JavaType<?> jdbcJavaType,
+			JdbcType jdbcType) throws SQLException {
+		int tagNameStart = -1;
+		int contentStart = -1;
+		for ( int i = start; i < string.length(); i++ ) {
+			final char c = string.charAt( i );
+			switch ( c ) {
+				case '<':
+					if ( tagNameStart == -1 ) {
+						if ( string.charAt( i + 1 ) == '/' ) {
+							// This is the parent closing tag, so we stop here
+							assert contentStart == -1;
+							return i;
+						}
+						// A start tag
+						tagNameStart = i + 1;
+					}
+					else {
+						if ( string.charAt( i + 1 ) == '/' ) {
+							// This is a closing tag
+							if ( !string.regionMatches( i + 2, ROOT_TAG + ">", 0, ROOT_TAG.length() + 1 ) ) {
+								throw new IllegalArgumentException( "XML not properly formed: " + string.substring( start ) );
+							}
+							arrayList.add( fromString(
+									javaType,
+									jdbcJavaType,
+									jdbcType,
+									string,
+									returnEmbeddable,
+									options,
+									contentStart,
+									i
+							) );
+						}
+						else {
+							// Nested tag
+							if ( jdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+								final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+								final Object[] array = new Object[embeddableMappingType.getJdbcValueCount() + ( embeddableMappingType.isPolymorphic() ? 1 : 0 )];
+								final int end = fromString( embeddableMappingType, string, returnEmbeddable, options, array, contentStart );
+
+								if ( returnEmbeddable ) {
+									final StructAttributeValues attributeValues = StructHelper.getAttributeValues( embeddableMappingType, array, options );
+									arrayList.add( instantiate( embeddableMappingType, attributeValues, options.getSessionFactory() ) );
+								}
+								else {
+									arrayList.add( array );
+								}
+								i = end + 1;
+							}
+							else {
+								throw new IllegalArgumentException( "XML not properly formed: " + string.substring( start ) );
+							}
+						}
+						// consume the whole closing tag
+						i += ROOT_TAG.length() + 2;
+						tagNameStart = -1;
+						contentStart = -1;
+					}
+					break;
+				case '>':
+					if ( contentStart == -1 ) {
+						// The closing angle bracket of the start tag
+						assert tagNameStart != -1;
+						if ( !ROOT_TAG.equals( string.substring( tagNameStart, i ) ) ) {
+							throw new IllegalArgumentException( "XML not properly formed: " + string.substring( start ) );
+						}
+						contentStart = i + 1;
+					}
+					else {
+						// This must be a char in the content
+					}
+					break;
+				case '/':
+					if ( contentStart == -1 ) {
+						// A shorthand tag encodes null
+						// Also, skip the closing angle bracket
+						arrayList.add( null );
+						i++;
+						tagNameStart = -1;
+						assert string.charAt( i ) == '>';
+					}
+					else {
+						// This must be a char in the content
+					}
+					break;
+			}
+		}
+		throw new IllegalArgumentException( "XML not properly formed: " + string.substring( start ) );
+	}
+
 	public static String toString(
 			EmbeddableMappingType embeddableMappingType,
 			Object value,
-			WrapperOptions options) {
+			WrapperOptions options) throws SQLException {
 		final StringBuilder sb = new StringBuilder();
 		sb.append( START_TAG );
-		toString( embeddableMappingType, value, options, new XMLAppender( sb ) );
+		toString( embeddableMappingType, embeddableMappingType.getValues( value ), options, new XMLAppender( sb ) );
 		sb.append( END_TAG );
 		return sb.toString();
 	}
 
+	public static String arrayToString(EmbeddableMappingType elementMappingType, Object[] values, WrapperOptions options) {
+		if ( values.length == 0 ) {
+			return EMPTY_COLLECTION_TAG;
+		}
+		final StringBuilder sb = new StringBuilder();
+		final XMLAppender xmlAppender = new XMLAppender( sb );
+		sb.append( COLLECTION_START_TAG );
+		for ( Object value : values ) {
+			if ( value == null ) {
+				sb.append( NULL_TAG );
+			}
+			else {
+				sb.append( START_TAG );
+				toString( elementMappingType, elementMappingType.getValues( value ), options, xmlAppender );
+				sb.append( END_TAG );
+			}
+		}
+		sb.append( COLLECTION_END_TAG );
+		return sb.toString();
+	}
+
+	public static String arrayToString(
+			JavaType<?> elementJavaType,
+			JdbcType elementJdbcType,
+			Object[] values,
+			WrapperOptions options) {
+		if ( values.length == 0 ) {
+			return EMPTY_COLLECTION_TAG;
+		}
+		final StringBuilder sb = new StringBuilder();
+		final XMLAppender xmlAppender = new XMLAppender( sb );
+		sb.append( COLLECTION_START_TAG );
+		for ( Object value : values ) {
+			if ( value == null ) {
+				sb.append( NULL_TAG );
+			}
+			else {
+				sb.append( START_TAG );
+				//noinspection unchecked
+				convertedBasicValueToString( xmlAppender, value, options, (JavaType<Object>) elementJavaType, elementJdbcType );
+				sb.append( END_TAG );
+			}
+		}
+		sb.append( COLLECTION_END_TAG );
+		return sb.toString();
+	}
+
 	private static void toString(
 			EmbeddableMappingType embeddableMappingType,
-			Object value,
+			@Nullable Object[] attributeValues,
 			WrapperOptions options,
 			XMLAppender sb) {
-		final Object[] array = embeddableMappingType.getValues( value );
-		for ( int i = 0; i < array.length; i++ ) {
-			if ( array[i] == null ) {
-				continue;
-			}
+		// Always append all the nodes, even if the value is null.
+		// This is done in order to allow using xmlextract/xmlextractvalue
+		// which fail if a XPath expression does not resolve to a result
+		final int attributeCount = embeddableMappingType.getNumberOfAttributeMappings();
+		for ( int i = 0; i < attributeCount; i++ ) {
+			final Object attributeValue = attributeValues == null ? null : attributeValues[i];
 			final ValuedModelPart attributeMapping = getEmbeddedPart( embeddableMappingType, i );
-			if ( attributeMapping instanceof SelectableMapping ) {
-				final SelectableMapping selectable = (SelectableMapping) attributeMapping;
+			if ( attributeMapping instanceof SelectableMapping selectable ) {
 				final String tagName = selectable.getSelectableName();
 				sb.append( '<' );
 				sb.append( tagName );
-				sb.append( '>' );
-				serializeValueTo( sb, selectable, array[i], options );
-				sb.append( '<' );
-				sb.append( '/' );
-				sb.append( tagName );
-				sb.append( '>' );
+				if ( attributeValue == null ) {
+					sb.append( "/>" );
+				}
+				else {
+					sb.append( '>' );
+					//noinspection unchecked
+					convertedBasicValueToString(
+							sb,
+							selectable.getJdbcMapping().convertToRelationalValue( attributeValue ),
+							options,
+							(JavaType<Object>) selectable.getJdbcMapping().getJdbcJavaType(),
+							selectable.getJdbcMapping().getJdbcType()
+					);
+					sb.append( "</" );
+					sb.append( tagName );
+					sb.append( '>' );
+				}
 			}
 			else if ( attributeMapping instanceof EmbeddedAttributeMapping ) {
 				final EmbeddableMappingType mappingType = (EmbeddableMappingType) attributeMapping.getMappedType();
 				final SelectableMapping aggregateMapping = mappingType.getAggregateMapping();
-				if ( aggregateMapping == null ) {
-					toString(
-							mappingType,
-							array[i],
-							options,
-							sb
-					);
-				}
-				else {
-					final String tagName = aggregateMapping.getSelectableName();
+				final String tagName = aggregateMapping == null ? null : aggregateMapping.getSelectableName();
+				if ( tagName != null ) {
 					sb.append( '<' );
 					sb.append( tagName );
 					sb.append( '>' );
-					toString(
-							mappingType,
-							array[i],
-							options,
-							sb
-					);
-					sb.append( '<' );
-					sb.append( '/' );
+				}
+				toString(
+						mappingType,
+						attributeValue == null ? null : mappingType.getValues( attributeValue ),
+						options,
+						sb
+				);
+				if ( tagName != null ) {
+					sb.append( "</" );
 					sb.append( tagName );
 					sb.append( '>' );
 				}
 			}
 			else {
-				throw new UnsupportedOperationException( "Unsupported attribute mapping: " + attributeMapping );
+				throw new UnsupportedOperationException( "Support for attribute mapping type not yet implemented: " + attributeMapping.getClass().getName() );
 			}
 		}
 	}
 
-	private static void serializeValueTo(XMLAppender appender, SelectableMapping selectable, Object value, WrapperOptions options) {
-		final JdbcMapping jdbcMapping = selectable.getJdbcMapping();
-		//noinspection unchecked
-		final JavaType<Object> jdbcJavaType = (JavaType<Object>) jdbcMapping.getJdbcJavaType();
-		final Object relationalValue = jdbcMapping.convertToRelationalValue( value );
-		switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
+	private static void convertedBasicValueToString(
+			XMLAppender appender,
+			Object value,
+			WrapperOptions options,
+			JavaType<Object> jdbcJavaType,
+			JdbcType jdbcType) {
+		switch ( jdbcType.getDefaultSqlTypeCode() ) {
 			case SqlTypes.TINYINT:
 			case SqlTypes.SMALLINT:
 			case SqlTypes.INTEGER:
-				if ( relationalValue instanceof Boolean ) {
+				if ( value instanceof Boolean ) {
 					// BooleanJavaType has this as an implicit conversion
-					appender.append( (Boolean) relationalValue ? '1' : '0' );
+					appender.append( (Boolean) value ? '1' : '0' );
+					break;
+				}
+				if ( value instanceof Enum ) {
+					appender.appendSql( ((Enum<?>) value ).ordinal() );
 					break;
 				}
 			case SqlTypes.BOOLEAN:
@@ -565,10 +843,11 @@ private static void serializeValueTo(XMLAppender appender, SelectableMapping sel
 			case SqlTypes.DECIMAL:
 			case SqlTypes.NUMERIC:
 			case SqlTypes.DURATION:
+			case SqlTypes.UUID:
 				jdbcJavaType.appendEncodedString(
 						appender,
 						jdbcJavaType.unwrap(
-								relationalValue,
+								value,
 								jdbcJavaType.getJavaTypeClass(),
 								options
 						)
@@ -578,20 +857,26 @@ private static void serializeValueTo(XMLAppender appender, SelectableMapping sel
 			case SqlTypes.NCHAR:
 			case SqlTypes.VARCHAR:
 			case SqlTypes.NVARCHAR:
-				if ( relationalValue instanceof Boolean ) {
+				if ( value instanceof Boolean ) {
 					// BooleanJavaType has this as an implicit conversion
-					appender.append( (Boolean) relationalValue ? 'Y' : 'N' );
+					appender.append( (Boolean) value ? 'Y' : 'N' );
 					break;
 				}
 			case SqlTypes.LONGVARCHAR:
 			case SqlTypes.LONGNVARCHAR:
 			case SqlTypes.LONG32VARCHAR:
 			case SqlTypes.LONG32NVARCHAR:
+			case SqlTypes.CLOB:
+			case SqlTypes.MATERIALIZED_CLOB:
+			case SqlTypes.NCLOB:
+			case SqlTypes.MATERIALIZED_NCLOB:
+			case SqlTypes.ENUM:
+			case SqlTypes.NAMED_ENUM:
 				appender.startEscaping();
 				jdbcJavaType.appendEncodedString(
 						appender,
 						jdbcJavaType.unwrap(
-								relationalValue,
+								value,
 								jdbcJavaType.getJavaTypeClass(),
 								options
 						)
@@ -626,11 +911,49 @@ private static void serializeValueTo(XMLAppender appender, SelectableMapping sel
 			case SqlTypes.VARBINARY:
 			case SqlTypes.LONGVARBINARY:
 			case SqlTypes.LONG32VARBINARY:
-			case SqlTypes.UUID:
-				appender.writeBase64( jdbcJavaType.unwrap( relationalValue, byte[].class, options ) );
+			case SqlTypes.BLOB:
+			case SqlTypes.MATERIALIZED_BLOB:
+				appender.write( jdbcJavaType.unwrap( value, byte[].class, options ) );
+				break;
+			case SqlTypes.ARRAY:
+			case SqlTypes.XML_ARRAY:
+				final int length = Array.getLength( value );
+				if ( length != 0 ) {
+					//noinspection unchecked
+					final JavaType<Object> elementJavaType = ( (BasicPluralJavaType<Object>) jdbcJavaType ).getElementJavaType();
+					final JdbcType elementJdbcType = ( (ArrayJdbcType) jdbcType ).getElementJdbcType();
+
+					if ( elementJdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+						final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+						for ( int i = 0; i < length; i++ ) {
+							final Object arrayElement = Array.get( value, i );
+							final Object[] arrayElementValues = arrayElement == null
+									? null
+									: embeddableMappingType.getValues( arrayElement );
+							appender.append( START_TAG );
+							toString( embeddableMappingType, arrayElementValues, options, appender );
+							appender.append( END_TAG );
+						}
+					}
+					else {
+						for ( int i = 0; i < length; i++ ) {
+							final Object arrayElement = Array.get( value, i );
+							if ( arrayElement == null ) {
+								appender.append( '<' );
+								appender.append( ROOT_TAG );
+								appender.append( "/>" );
+							}
+							else {
+								appender.append( START_TAG );
+								convertedBasicValueToString( appender, arrayElement, options, elementJavaType, elementJdbcType );
+								appender.append( END_TAG );
+							}
+						}
+					}
+				}
 				break;
 			default:
-				throw new UnsupportedOperationException( "Unsupported JdbcType nested in struct: " + jdbcMapping.getJdbcType() );
+				throw new UnsupportedOperationException( "Unsupported JdbcType nested in struct: " + jdbcType );
 		}
 	}
 
@@ -641,7 +964,7 @@ private static int getSelectableMapping(
 		if ( selectableIndex == -1 ) {
 			throw new IllegalArgumentException(
 					String.format(
-							"Could not find selectable [%s] in embeddable type [%s] for JSON processing.",
+							"Could not find selectable [%s] in embeddable type [%s] for XML processing.",
 							name,
 							embeddableMappingType.getMappedJavaType().getJavaTypeClass().getName()
 					)
@@ -677,7 +1000,6 @@ private static class XMLAppender extends OutputStream implements SqlAppender {
 		private final static char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
 		private final StringBuilder sb;
 		private boolean escape;
-		private OutputStream base64OutputStream;
 
 		public XMLAppender(StringBuilder sb) {
 			this.sb = sb;
@@ -792,22 +1114,14 @@ public void write(byte[] bytes, int off, int len) {
 				sb.append( HEX_ARRAY[v & 0x0F] );
 			}
 		}
-
-		public void writeBase64(byte[] bytes) {
-			if ( base64OutputStream == null ) {
-				base64OutputStream = Base64.getEncoder().wrap( this );
-			}
-			try {
-				base64OutputStream.write( bytes );
-			}
-			catch (IOException e) {
-				// Should never happen
-				throw new RuntimeException( e );
-			}
-		}
 	}
 
+	private static final CollectionTags DEFAULT = new CollectionTags( "Collection", ROOT_TAG );
+
 	public static CollectionTags determineCollectionTags(BasicPluralJavaType<?> pluralJavaType, SessionFactoryImplementor sessionFactory) {
+		if ( !sessionFactory.getSessionFactoryOptions().isXmlFormatMapperLegacyFormatEnabled() ) {
+			return DEFAULT;
+		}
 		//noinspection unchecked
 		final JavaType<Object> javaType = (JavaType<Object>) pluralJavaType;
 		final LazySessionWrapperOptions lazySessionWrapperOptions = new LazySessionWrapperOptions( sessionFactory );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
index 1a948106b8a4..7457b23d4623 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
@@ -65,7 +65,8 @@ default String aggregateComponentCustomReadExpression(
 						column.getScale(),
 						column.getTemporalPrecision(),
 						column.getType()
-				)
+				),
+				aggregateColumn.getComponent().getMetadata().getTypeConfiguration()
 		);
 	}
 
@@ -80,7 +81,7 @@ default String aggregateComponentCustomReadExpression(
 	 * @param columnExpression The column within the aggregate type, for which to return the read expression
 	 * @param aggregateColumnTypeCode The SQL type code of the aggregate column
 	 * @param column The column within the aggregate type, for which to return the read expression
-	 *
+	 * @param typeConfiguration The type configuration
 	 * @since 7.0
 	 */
 	String aggregateComponentCustomReadExpression(
@@ -89,7 +90,8 @@ String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column);
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration);
 
 	/**
 	 * Returns the assignment expression to use for {@code column},
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
index 0fa815973239..5eb50a47ce3f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupportImpl.java
@@ -13,15 +13,27 @@
 import org.hibernate.mapping.Column;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
-import org.hibernate.type.SqlTypes;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.type.SqlTypes.ARRAY;
+import static org.hibernate.type.SqlTypes.JSON;
+import static org.hibernate.type.SqlTypes.JSON_ARRAY;
+import static org.hibernate.type.SqlTypes.SQLXML;
+import static org.hibernate.type.SqlTypes.XML_ARRAY;
+
 public class AggregateSupportImpl implements AggregateSupport {
 
 	public static final AggregateSupport INSTANCE = new AggregateSupportImpl();
 
 	@Override
-	public String aggregateComponentCustomReadExpression(String template, String placeholder, String aggregateParentReadExpression, String columnExpression, int aggregateColumnTypeCode, SqlTypedMapping column) {
+	public String aggregateComponentCustomReadExpression(
+			String template,
+			String placeholder,
+			String aggregateParentReadExpression,
+			String columnExpression,
+			int aggregateColumnTypeCode,
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		throw new UnsupportedOperationException( "Dialect does not support aggregateComponentCustomReadExpression: " + getClass().getName() );
 	}
 
@@ -78,7 +90,8 @@ public List<AuxiliaryDatabaseObject> aggregateAuxiliaryDatabaseObjects(
 	@Override
 	public int aggregateComponentSqlTypeCode(int aggregateColumnSqlTypeCode, int columnSqlTypeCode) {
 		return switch (aggregateColumnSqlTypeCode) {
-			case SqlTypes.JSON -> columnSqlTypeCode == SqlTypes.ARRAY ? SqlTypes.JSON_ARRAY : columnSqlTypeCode;
+			case JSON -> columnSqlTypeCode == ARRAY ? JSON_ARRAY : columnSqlTypeCode;
+			case SQLXML -> columnSqlTypeCode == ARRAY ? XML_ARRAY : columnSqlTypeCode;
 			default -> columnSqlTypeCode;
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/CockroachDBAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/CockroachDBAggregateSupport.java
index be72ff699282..07738a67ffb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/CockroachDBAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/CockroachDBAggregateSupport.java
@@ -49,7 +49,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON_ARRAY:
 			case JSON:
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
index 23b42d669311..70e3a76e8fce 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
@@ -45,6 +45,7 @@
 import static org.hibernate.type.SqlTypes.JSON_ARRAY;
 import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
 import static org.hibernate.type.SqlTypes.SMALLINT;
+import static org.hibernate.type.SqlTypes.SQLXML;
 import static org.hibernate.type.SqlTypes.STRUCT;
 import static org.hibernate.type.SqlTypes.TIME;
 import static org.hibernate.type.SqlTypes.TIMESTAMP;
@@ -52,6 +53,7 @@
 import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.UUID;
 import static org.hibernate.type.SqlTypes.VARBINARY;
+import static org.hibernate.type.SqlTypes.XML_ARRAY;
 
 public class DB2AggregateSupport extends AggregateSupportImpl {
 
@@ -59,6 +61,9 @@ public class DB2AggregateSupport extends AggregateSupportImpl {
 	public static final AggregateSupport JSON_INSTANCE = new DB2AggregateSupport( true );
 	private static final String JSON_QUERY_START = "json_query(";
 	private static final String JSON_QUERY_JSON_END = "')";
+	private static final String XML_EXTRACT_START = "xmlelement(name \"" + XmlHelper.ROOT_TAG + "\",xmlquery(";
+	private static final String XML_EXTRACT_SEPARATOR = "/*' passing ";
+	private static final String XML_EXTRACT_END = " as \"d\"))";
 
 	private final boolean jsonSupport;
 
@@ -73,7 +78,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
@@ -133,12 +139,91 @@ public String aggregateComponentCustomReadExpression(
 								"json_value(" + parentPartExpression + columnExpression + "' returning " + column.getColumnDefinition() + ")"
 						);
 				}
+			case SQLXML:
+			case XML_ARRAY:
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case BOOLEAN:
+						if ( SqlTypes.isNumericType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
+							return template.replace(
+									placeholder,
+									"decode(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as varchar(5)),'true',1,'false',0)"
+							);
+						}
+						else {
+							return template.replace(
+									placeholder,
+									"decode(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as varchar(5)),'true',true,'false',false)"
+							);
+						}
+					case BINARY:
+					case VARBINARY:
+					case LONG32VARBINARY:
+					case BLOB:
+						// We encode binary data as hex, so we have to decode here
+						return template.replace(
+								placeholder,
+								"hextoraw(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as clob))"
+						);
+					case TIMESTAMP_WITH_TIMEZONE:
+					case TIMESTAMP_UTC:
+						return template.replace(
+								placeholder,
+								"cast(trim(trailing 'Z' from xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as varchar(35))) as " + column.getColumnDefinition() + ")"
+						);
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								XML_EXTRACT_START + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + "))"
+						);
+					case XML_ARRAY:
+						if ( typeConfiguration.getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled() ) {
+							throw new IllegalArgumentException( "XML array '" + columnExpression + "' in '" + aggregateParentReadExpression + "' is not supported with legacy format enabled." );
+						}
+						else {
+							return template.replace(
+									placeholder,
+									"xmlelement(name \"Collection\",xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + "))"
+							);
+						}
+					case UUID:
+						if ( SqlTypes.isBinaryType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
+							return template.replace(
+									placeholder,
+									"hextoraw(replace(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as varchar(36)),'-',''))"
+							);
+						}
+						// Fall-through intended
+					default:
+						return template.replace(
+								placeholder,
+								"xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + ") as " + column.getColumnDefinition() + ")"
+						);
+				}
 			case STRUCT:
 				return template.replace( placeholder, aggregateParentReadExpression + ".." + columnExpression );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
+	private static String xmlExtractArguments(String aggregateParentReadExpression, String xpathFragment) {
+		final String extractArguments;
+		final int separatorIndex;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
+				&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
+				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex + 2, aggregateParentReadExpression.length() - 2 );
+			extractArguments = sb.toString();
+		}
+		else {
+			extractArguments = "'$d/" + XmlHelper.ROOT_TAG + "/" + xpathFragment + "' passing " + aggregateParentReadExpression + " as \"d\"";
+		}
+		return extractArguments;
+	}
+
 	private static String jsonCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
 		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
 		switch ( sqlTypeCode ) {
@@ -166,6 +251,33 @@ private static String jsonCustomWriteExpression(String customWriteExpression, Jd
 		}
 	}
 
+	private static String xmlCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
+		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
+		switch ( sqlTypeCode ) {
+			case BINARY:
+			case VARBINARY:
+			case LONG32VARBINARY:
+			case BLOB:
+				// We encode binary data as hex
+				return "hex(" + customWriteExpression + ")";
+			case UUID:
+				return "regexp_replace(lower(hex(" + customWriteExpression + ")),'^(.{8})(.{4})(.{4})(.{4})(.{12})$','$1-$2-$3-$4-$5')";
+//			case ARRAY:
+//			case XML_ARRAY:
+//				return "(" + customWriteExpression + ") format json";
+			case BOOLEAN:
+				return "decode(" + customWriteExpression + ",true,'true',false,'false')";
+			case TIME:
+				return "varchar_format(timestamp('1970-01-01'," + customWriteExpression + "),'HH24:MI:SS')";
+			case TIMESTAMP:
+				return "replace(varchar_format(" + customWriteExpression + ",'YYYY-MM-DD HH24:MI:SS.FF9'),' ','T')";
+			case TIMESTAMP_UTC:
+				return "replace(varchar_format(" + customWriteExpression + ",'YYYY-MM-DD HH24:MI:SS.FF9'),' ','T')||'Z'";
+			default:
+				return customWriteExpression;
+		}
+	}
+
 	@Override
 	public String aggregateComponentAssignmentExpression(
 			String aggregateParentAssignmentExpression,
@@ -180,6 +292,9 @@ public String aggregateComponentAssignmentExpression(
 					return aggregateParentAssignmentExpression;
 				}
 				break;
+			case SQLXML:
+			case XML_ARRAY:
+				return aggregateParentAssignmentExpression;
 			case STRUCT:
 				return aggregateParentAssignmentExpression + ".." + columnExpression;
 		}
@@ -193,13 +308,16 @@ public String aggregateCustomWriteExpression(
 		// We need to know what array this is STRUCT_ARRAY/JSON_ARRAY/XML_ARRAY,
 		// which we can easily get from the type code of the aggregate column
 		final int sqlTypeCode = aggregateColumn.getType().getJdbcType().getDefaultSqlTypeCode();
-		switch ( sqlTypeCode == SqlTypes.ARRAY ? aggregateColumn.getTypeCode() : sqlTypeCode ) {
+		switch ( sqlTypeCode == ARRAY ? aggregateColumn.getTypeCode() : sqlTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
 				if ( jsonSupport ) {
 					return null;
 				}
 				break;
+			case SQLXML:
+			case XML_ARRAY:
+				return null;
 			case STRUCT:
 				final StringBuilder sb = new StringBuilder();
 				appendStructCustomWriteExpression( aggregateColumn, aggregatedColumns, sb );
@@ -232,21 +350,18 @@ private static void appendStructCustomWriteExpression(
 
 	@Override
 	public int aggregateComponentSqlTypeCode(int aggregateColumnSqlTypeCode, int columnSqlTypeCode) {
-		if ( aggregateColumnSqlTypeCode == STRUCT ) {
+		return switch (aggregateColumnSqlTypeCode) {
 			// DB2 doesn't support booleans in structs
-			return columnSqlTypeCode == BOOLEAN ? SMALLINT : columnSqlTypeCode;
-		}
-		else if ( aggregateColumnSqlTypeCode == JSON ) {
-			return columnSqlTypeCode == ARRAY ? JSON_ARRAY : columnSqlTypeCode;
-		}
-		else {
-			return columnSqlTypeCode;
-		}
+			case STRUCT -> columnSqlTypeCode == BOOLEAN ? SMALLINT : columnSqlTypeCode;
+			case JSON -> columnSqlTypeCode == ARRAY ? JSON_ARRAY : columnSqlTypeCode;
+			case SQLXML -> columnSqlTypeCode == ARRAY ? XML_ARRAY : columnSqlTypeCode;
+			default -> columnSqlTypeCode;
+		};
 	}
 
 	@Override
 	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
-		return aggregateSqlTypeCode == STRUCT || aggregateSqlTypeCode == JSON;
+		return aggregateSqlTypeCode == STRUCT || aggregateSqlTypeCode == JSON || aggregateSqlTypeCode == SQLXML;
 	}
 
 	@Override
@@ -258,28 +373,17 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
 				if ( jsonSupport ) {
-					return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate );
+					return new RootJsonWriteExpression( aggregateColumn, columnsToUpdate );
 				}
 				break;
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate );
 			case STRUCT:
-				return structAggregateColumnWriter( aggregateColumn, columnsToUpdate, typeConfiguration );
+				return new RootStructWriteExpression( aggregateColumn, columnsToUpdate, typeConfiguration );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
 
-	private WriteExpressionRenderer jsonAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns) {
-		return new RootJsonWriteExpression( aggregateColumn, columns );
-	}
-
-	private WriteExpressionRenderer structAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns,
-			TypeConfiguration typeConfiguration) {
-		return new RootStructWriteExpression( aggregateColumn, columns, typeConfiguration );
-	}
-
 	private static String determineTypeName(SelectableMapping column, TypeConfiguration typeConfiguration) {
 		final String typeName;
 		if ( column.getColumnDefinition() == null ) {
@@ -469,21 +573,23 @@ public List<AuxiliaryDatabaseObject> aggregateAuxiliaryDatabaseObjects(
 			return Collections.emptyList();
 		}
 		final String columnType = aggregateColumn.getTypeName();
+		final boolean legacyXmlFormatEnabled = aggregateColumn.getValue().getBuildingContext().getBuildingOptions()
+				.isXmlFormatMapperLegacyFormatEnabled();
 		// The serialize and deserialize functions, as well as the transform are for supporting struct types in native queries and functions
 		var list = new ArrayList<AuxiliaryDatabaseObject>( 3 );
 		var serializerSb = new StringBuilder();
 		var deserializerSb = new StringBuilder();
 		serializerSb.append( "create function " ).append( columnType ).append( "_serializer(v " ).append( columnType ).append( ") returns xml language sql " )
 				.append( "return xmlelement(name \"").append( XmlHelper.ROOT_TAG ).append( "\"" );
-		appendSerializer( aggregatedColumns, serializerSb, "v.." );
+		appendSerializer( aggregatedColumns, serializerSb, "v..", legacyXmlFormatEnabled );
 		serializerSb.append( ')' );
 
 		deserializerSb.append( "create function " ).append( columnType ).append( "_deserializer(v xml) returns " ).append( columnType ).append( " language sql " )
 				.append( "return select " ).append( columnType ).append( "()" );
-		appendDeserializerConstructor( aggregatedColumns, deserializerSb, "" );
+		appendDeserializerConstructor( aggregatedColumns, deserializerSb, "", legacyXmlFormatEnabled );
 		deserializerSb.append( " from xmltable('$" ).append( XmlHelper.ROOT_TAG ).append( "' passing v as \"" )
 				.append( XmlHelper.ROOT_TAG ).append( "\" columns" );
-		appendDeserializerColumns( aggregatedColumns, deserializerSb, ' ', "" );
+		appendDeserializerColumns( aggregatedColumns, deserializerSb, ' ', "", legacyXmlFormatEnabled );
 		deserializerSb.append( ") as t" );
 		list.add(
 				new NamedAuxiliaryDatabaseObject(
@@ -515,7 +621,7 @@ public List<AuxiliaryDatabaseObject> aggregateAuxiliaryDatabaseObjects(
 		return list;
 	}
 
-	private static void appendSerializer(List<Column> aggregatedColumns, StringBuilder serializerSb, String prefix) {
+	private static void appendSerializer(List<Column> aggregatedColumns, StringBuilder serializerSb, String prefix, boolean legacyXmlFormatEnabled) {
 		char sep;
 		if ( aggregatedColumns.size() > 1 ) {
 			serializerSb.append( ",xmlconcat" );
@@ -532,12 +638,26 @@ private static void appendSerializer(List<Column> aggregatedColumns, StringBuild
 				appendSerializer(
 						aggregateColumn.getComponent().getAggregatedColumns(),
 						serializerSb,
-						prefix + udtColumn.getName() + ".."
+						prefix + udtColumn.getName() + "..",
+						legacyXmlFormatEnabled
 				);
 			}
 			else if ( needsVarcharForBitDataCast( udtColumn.getSqlType() ) ) {
-				serializerSb.append( ",cast(" ).append( prefix ).append( udtColumn.getName() ).append( " as varchar(" )
-						.append( udtColumn.getColumnSize( null, null ).getLength() ).append( ") for bit data)" );
+				if ( legacyXmlFormatEnabled ) {
+					serializerSb.append( ",cast(" ).append( prefix ).append( udtColumn.getName() ).append( " as " );
+					final long binaryLength = udtColumn.getColumnSize( null, null ).getLength();
+					// Legacy is Base64 encoded which is 4/3 bigger
+					final long varcharLength = ( binaryLength << 2 ) / 3;
+					if ( varcharLength < 32_672L ) {
+						serializerSb.append( "varchar(" ).append( varcharLength ).append( ") for bit data)" );
+					}
+					else {
+						serializerSb.append( "clob)" );
+					}
+				}
+				else {
+					serializerSb.append( ",hex(" ).append( prefix ).append( udtColumn.getName() ).append( ")" );
+				}
 			}
 			else {
 				serializerSb.append( ',' ).append( prefix ).append( udtColumn.getName() );
@@ -553,7 +673,8 @@ else if ( needsVarcharForBitDataCast( udtColumn.getSqlType() ) ) {
 	private static void appendDeserializerConstructor(
 			List<Column> aggregatedColumns,
 			StringBuilder deserializerSb,
-			String prefix) {
+			String prefix,
+			boolean legacyXmlFormatEnabled) {
 		for ( Column udtColumn : aggregatedColumns ) {
 			deserializerSb.append( ".." ).append( udtColumn.getName() ).append( '(' );
 			if ( udtColumn.getSqlTypeCode() == STRUCT ) {
@@ -562,13 +683,20 @@ private static void appendDeserializerConstructor(
 				appendDeserializerConstructor(
 						aggregateColumn.getComponent().getAggregatedColumns(),
 						deserializerSb,
-						udtColumn.getName() + "_"
+						udtColumn.getName() + "_",
+						legacyXmlFormatEnabled
 				);
 				deserializerSb.append( ')' );
 			}
 			else if ( needsVarcharForBitDataCast( udtColumn.getSqlType() ) ) {
-				deserializerSb.append( "cast(t." ).append( prefix ).append( udtColumn.getName() ).append( " as " )
-						.append( udtColumn.getSqlType() ).append( "))" );
+				if ( legacyXmlFormatEnabled ) {
+					deserializerSb.append( "cast(t." ).append( prefix ).append( udtColumn.getName() ).append( " as " )
+							.append( udtColumn.getSqlType() ).append( "))" );
+				}
+				else {
+					deserializerSb.append( "cast(hextoraw(t." ).append( prefix ).append( udtColumn.getName() ).append( ") as " )
+							.append( udtColumn.getSqlType() ).append( "))" );
+				}
 			}
 			else {
 				deserializerSb.append( "t." ).append( prefix ).append( udtColumn.getName() ).append( ')' );
@@ -580,7 +708,8 @@ private static void appendDeserializerColumns(
 			List<Column> aggregatedColumns,
 			StringBuilder deserializerSb,
 			char sep,
-			String prefix) {
+			String prefix,
+			boolean legacyXmlFormatEnabled) {
 		for ( Column udtColumn : aggregatedColumns ) {
 			if ( udtColumn.getSqlTypeCode() == STRUCT ) {
 				final AggregateColumn aggregateColumn = (AggregateColumn) udtColumn;
@@ -588,15 +717,29 @@ private static void appendDeserializerColumns(
 						aggregateColumn.getComponent().getAggregatedColumns(),
 						deserializerSb,
 						sep,
-						udtColumn.getName() + "_"
+						udtColumn.getName() + "_",
+						legacyXmlFormatEnabled
 				);
 			}
 			else {
 				deserializerSb.append( sep );
 				deserializerSb.append( prefix ).append( udtColumn.getName() ).append( ' ' );
 				if ( needsVarcharForBitDataCast( udtColumn.getSqlType() ) ) {
-					deserializerSb.append( "varchar(" )
-							.append( udtColumn.getColumnSize( null, null ).getLength() ).append( ") for bit data" );
+					final long binaryLength = udtColumn.getColumnSize( null, null ).getLength();
+					final long varcharLength;
+					if ( legacyXmlFormatEnabled ) {
+						// Legacy is Base64 encoded which is 4/3 bigger
+						varcharLength = ( binaryLength << 2 ) / 3;
+					}
+					else {
+						varcharLength = binaryLength << 1;
+					}
+					if ( varcharLength < 32_672L ) {
+						deserializerSb.append( "varchar(" ).append( varcharLength ).append( ") for bit data" );
+					}
+					else {
+						deserializerSb.append( "clob" );
+					}
 				}
 				else {
 					deserializerSb.append( udtColumn.getSqlType() );
@@ -658,7 +801,7 @@ protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn)
 				if ( jsonWriteExpression == null ) {
 					subExpressions.put(
 							selectableMapping.getSelectableName(),
-							new PassThroughExpression( selectableMapping )
+							new PassThroughJsonWriteExpression( selectableMapping )
 					);
 				}
 				else if ( jsonWriteExpression instanceof AggregateJsonWriteExpression writeExpression ) {
@@ -759,11 +902,11 @@ public void append(
 		}
 	}
 
-	private static class PassThroughExpression implements JsonWriteExpression {
+	private static class PassThroughJsonWriteExpression implements JsonWriteExpression {
 
 		private final SelectableMapping selectableMapping;
 
-		PassThroughExpression(SelectableMapping selectableMapping) {
+		PassThroughJsonWriteExpression(SelectableMapping selectableMapping) {
 			this.selectableMapping = selectableMapping;
 		}
 
@@ -780,4 +923,158 @@ public void append(
 		}
 	}
 
+	private static class RootXmlWriteExpression implements WriteExpressionRenderer {
+		private final SelectableMapping aggregateColumn;
+		private final SelectableMapping[] columns;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			this.aggregateColumn = aggregateColumn;
+			this.columns = columns;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			sqlAppender.append( "xmldocument(xmlquery('transform copy $d-out:=if(empty($d-in)) then <" );
+			sqlAppender.append( XmlHelper.ROOT_TAG );
+			sqlAppender.append( "/> else $d-in/" );
+			sqlAppender.append( XmlHelper.ROOT_TAG );
+			sqlAppender.append( " modify " );
+
+			char separator = '(';
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final String tagXPath = columnXPath( selectablePath );
+				final String columnVariable = columnVariable( selectablePath );
+				sqlAppender.append( separator );
+				sqlAppender.append( "if(empty($" );
+				sqlAppender.append( columnVariable );
+				sqlAppender.append( ")) then do delete $d-out" );
+				sqlAppender.append( tagXPath );
+				sqlAppender.append( " else if(empty($d-out" );
+				sqlAppender.append( tagXPath );
+				sqlAppender.append( ")) then" );
+
+				SelectablePath parentPath = selectablePath.getParent();
+				assert parentPath != null;
+				renderParentInserts( sqlAppender, parentPath, "{$" + columnVariable + "}" );
+
+				sqlAppender.append( " do insert $" );
+				sqlAppender.append( columnVariable );
+				sqlAppender.append( " into $d-out" );
+				sqlAppender.append( columnXPath( selectablePath.getParent() ) );
+				sqlAppender.append( " else do replace $d-out" );
+				sqlAppender.append( tagXPath );
+				sqlAppender.append( " with $" );
+				sqlAppender.append( columnVariable );
+				separator = ',';
+			}
+
+			sqlAppender.append( ") return <" );
+			sqlAppender.append( XmlHelper.ROOT_TAG );
+			sqlAppender.append( ">{$d-out/*}</" );
+			sqlAppender.append( XmlHelper.ROOT_TAG );
+			sqlAppender.append( ">' passing " );
+			if ( qualifier != null && !qualifier.isBlank() ) {
+				sqlAppender.append( qualifier );
+				sqlAppender.append( '.' );
+			}
+			sqlAppender.append( aggregateColumn.getSelectionExpression() );
+			sqlAppender.append( " as \"d-in\"" );
+
+			for ( SelectableMapping column : columns ) {
+				sqlAppender.append( ",xmlelement(name " );
+				sqlAppender.appendDoubleQuoteEscapedString( column.getSelectableName() );
+				sqlAppender.append( ',' );
+				appendColumn(
+						sqlAppender,
+						column,
+						xmlCustomWriteExpression( column.getCustomWriteExpression(), column.getJdbcMapping() ),
+						translator,
+						aggregateColumnWriteExpression
+				);
+				sqlAppender.append( " option null on null) as " );
+				sqlAppender.appendDoubleQuoteEscapedString( columnVariable( column.getSelectablePath() ) );
+			}
+
+			sqlAppender.append( "))" );
+		}
+
+		private void renderParentInserts(SqlAppender sqlAppender, SelectablePath parentPath, String parentContent) {
+			if ( !parentPath.isRoot() ) {
+				final String newParentContent = "<" + parentPath.getSelectableName() + ">" + parentContent + "</" + parentPath.getSelectableName() + ">";
+				final SelectablePath grandParentPath = parentPath.getParent();
+				assert grandParentPath != null;
+
+				sqlAppender.append( " if(empty($d-out" );
+				sqlAppender.append( columnXPath( parentPath ) );
+				sqlAppender.append( ")) then" );
+				renderParentInserts( sqlAppender, grandParentPath, newParentContent );
+				sqlAppender.append( " do insert " );
+				sqlAppender.append( newParentContent );
+				sqlAppender.append( " into $d-out" );
+				sqlAppender.append( columnXPath( grandParentPath ) );
+				sqlAppender.append( " else" );
+			}
+		}
+
+		private String columnXPath(SelectablePath selectablePath) {
+			final SelectablePath[] parts = selectablePath.getParts();
+			final StringBuilder xpath = new StringBuilder();
+			for ( int i = 1; i < parts.length; i++ ) {
+				xpath.append( '/' );
+				xpath.append( parts[i].getSelectableName() );
+			}
+			return xpath.toString();
+		}
+
+		private String columnVariable(SelectablePath selectablePath) {
+			final SelectablePath[] parts = selectablePath.getParts();
+			final StringBuilder variable = new StringBuilder();
+			for ( int i = 1; i < parts.length; i++ ) {
+				variable.append( parts[i].getSelectableName() );
+				variable.append( '-' );
+			}
+			variable.append( "in" );
+			return variable.toString();
+		}
+
+		private void appendColumn(
+				SqlAppender sb,
+				SelectableMapping selectableMapping,
+				String customWriteExpression,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final String customWriteExpressionStart;
+			final String customWriteExpressionEnd;
+			if ( customWriteExpression.equals( "?" ) ) {
+				customWriteExpressionStart = "";
+				customWriteExpressionEnd = "";
+			}
+			else {
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2;
+				customWriteExpressionStart = parts[0];
+				customWriteExpressionEnd = parts[1];
+			}
+
+			final boolean isArray = selectableMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() == XML_ARRAY;
+			if ( isArray ) {
+				sb.append( "xmlquery('$d/*/*' passing " );
+			}
+			sb.append( customWriteExpressionStart );
+			// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+			// since we don't know how the custom write expression looks like where this is embedded,
+			// so we have to be pessimistic and avoid ambiguities
+			translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+			sb.append( customWriteExpressionEnd );
+			if ( isArray ) {
+				sb.append( " as \"d\")" );
+			}
+		}
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
index 134113c66e45..02e5485555d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
@@ -48,7 +48,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON_ARRAY:
 			case JSON:
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/HANAAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/HANAAggregateSupport.java
index bc67ae706906..5de48bc9a993 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/HANAAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/HANAAggregateSupport.java
@@ -5,7 +5,7 @@
 package org.hibernate.dialect.aggregate;
 
 import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.json.HANAJsonValueFunction;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Column;
@@ -25,7 +25,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.hibernate.type.SqlTypes.ARRAY;
+import static org.hibernate.dialect.function.json.HANAJsonValueFunction.jsonValueReturningType;
+import static org.hibernate.dialect.function.xml.HANAXmlTableFunction.xmlValueReturningType;
 import static org.hibernate.type.SqlTypes.BIGINT;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BLOB;
@@ -41,19 +42,27 @@
 import static org.hibernate.type.SqlTypes.NUMERIC;
 import static org.hibernate.type.SqlTypes.REAL;
 import static org.hibernate.type.SqlTypes.SMALLINT;
+import static org.hibernate.type.SqlTypes.SQLXML;
 import static org.hibernate.type.SqlTypes.TIME;
 import static org.hibernate.type.SqlTypes.TIMESTAMP;
 import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
 import static org.hibernate.type.SqlTypes.TINYINT;
 import static org.hibernate.type.SqlTypes.UUID;
 import static org.hibernate.type.SqlTypes.VARBINARY;
+import static org.hibernate.type.SqlTypes.XML_ARRAY;
 
 public class HANAAggregateSupport extends AggregateSupportImpl {
 
 	private static final AggregateSupport INSTANCE = new HANAAggregateSupport();
 
 	private static final String JSON_QUERY_START = "json_query(";
-	private static final String JSON_QUERY_JSON_END = "' error on error)";
+	private static final String JSON_QUERY_END = "' error on error)";
+	private static final String XML_EXTRACT_START = "xmlextract(";
+	private static final String XML_EXTRACT_END = "')";
+	private static final String XML_EXTRACT_READ_START = "case when ";
+	private static final String XML_EXTRACT_READ_NULL_CHECK = " is null then null else ";
+	private static final String XML_EXTRACT_READ_INVOCATION_START = "'<" + XmlHelper.ROOT_TAG + ">'||xmlextract(";
+	private static final String XML_EXTRACT_READ_END = "/*')||'</" + XmlHelper.ROOT_TAG + ">' end";
 
 	private HANAAggregateSupport() {
 	}
@@ -69,23 +78,24 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				final String parentPartExpression = determineParentPartExpression( aggregateParentReadExpression );
+				final String jsonParentPartExpression = determineJsonParentPartExpression( aggregateParentReadExpression );
 				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
 					case BOOLEAN:
 						if ( SqlTypes.isNumericType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
 							return template.replace(
 									placeholder,
-									"case json_value(" + parentPartExpression + columnExpression + "') when 'true' then 1 when 'false' then 0 end"
+									"case json_value(" + jsonParentPartExpression + columnExpression + "') when 'true' then 1 when 'false' then 0 end"
 							);
 						}
 						else {
 							return template.replace(
 									placeholder,
-									"case json_value(" + parentPartExpression + columnExpression + "') when 'true' then true when 'false' then false end"
+									"case json_value(" + jsonParentPartExpression + columnExpression + "') when 'true' then true when 'false' then false end"
 							);
 						}
 					case DATE:
@@ -94,7 +104,7 @@ public String aggregateComponentCustomReadExpression(
 					case TIMESTAMP_UTC:
 						return template.replace(
 								placeholder,
-								"cast(json_value(" + parentPartExpression + columnExpression + "') as " + column.getColumnDefinition() + ")"
+								"cast(json_value(" + jsonParentPartExpression + columnExpression + "') as " + column.getColumnDefinition() + ")"
 						);
 					case BINARY:
 					case VARBINARY:
@@ -103,37 +113,104 @@ public String aggregateComponentCustomReadExpression(
 						// We encode binary data as hex, so we have to decode here
 						return template.replace(
 								placeholder,
-								"hextobin(json_value(" + parentPartExpression + columnExpression + "' error on error))"
+								"hextobin(json_value(" + jsonParentPartExpression + columnExpression + "' error on error))"
 						);
 					case JSON:
 					case JSON_ARRAY:
 						return template.replace(
 								placeholder,
-								"json_query(" + parentPartExpression + columnExpression + "' error on error)"
+								"json_query(" + jsonParentPartExpression + columnExpression + "' error on error)"
 						);
 					case UUID:
 						if ( SqlTypes.isBinaryType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
 							return template.replace(
 									placeholder,
-									"hextobin(replace(json_value(" + parentPartExpression + columnExpression + "'),'-',''))"
+									"hextobin(replace(json_value(" + jsonParentPartExpression + columnExpression + "'),'-',''))"
 							);
 						}
 						// Fall-through intended
 					default:
 						return template.replace(
 								placeholder,
-								"json_value(" + parentPartExpression + columnExpression + "' returning " + HANAJsonValueFunction.jsonValueReturningType(
-										column ) + " error on error)"
+								"json_value(" + jsonParentPartExpression + columnExpression + "' returning " + jsonValueReturningType( column ) + " error on error)"
+						);
+				}
+			case SQLXML:
+			case XML_ARRAY:
+				final String xmlParentPartExpression;
+				final int patternIdx;
+				final String caseExpression;
+				if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_READ_START )
+					&& aggregateParentReadExpression.endsWith( XML_EXTRACT_READ_END )
+					&& (patternIdx = aggregateParentReadExpression.indexOf( XML_EXTRACT_READ_NULL_CHECK )) != -1
+					&& aggregateParentReadExpression.regionMatches( patternIdx + XML_EXTRACT_READ_NULL_CHECK.length(),
+						XML_EXTRACT_READ_INVOCATION_START, 0, XML_EXTRACT_READ_INVOCATION_START.length() )) {
+					caseExpression = aggregateParentReadExpression.substring( 0, patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() );
+					xmlParentPartExpression = aggregateParentReadExpression.substring(
+							patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() + XML_EXTRACT_READ_INVOCATION_START.length(),
+							aggregateParentReadExpression.length() - XML_EXTRACT_READ_END.length()
+					) + "/";
+				}
+				else {
+					caseExpression = XML_EXTRACT_READ_START + aggregateParentReadExpression + XML_EXTRACT_READ_NULL_CHECK;
+					xmlParentPartExpression = aggregateParentReadExpression + ",'/" + XmlHelper.ROOT_TAG + "/";
+				}
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case BINARY:
+					case VARBINARY:
+					case LONG32VARBINARY:
+					case BLOB:
+						// We encode binary data as hex, so we have to decode here
+						return template.replace(
+								placeholder,
+								caseExpression + "hextobin(xmlextractvalue(" + xmlParentPartExpression + columnExpression + "')) end"
+						);
+					case DATE:
+					case TIME:
+					case TIMESTAMP:
+					case TIMESTAMP_UTC:
+						// Cast from clob to varchar first
+						return template.replace(
+								placeholder,
+								caseExpression + "cast(cast(xmlextractvalue(" + xmlParentPartExpression + columnExpression + "') as varchar(36)) as " + xmlValueReturningType( column, column.getColumnDefinition() ) + ") end"
+						);
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								caseExpression + XML_EXTRACT_READ_INVOCATION_START + xmlParentPartExpression + columnExpression + XML_EXTRACT_READ_END
+						);
+					case XML_ARRAY:
+						if ( typeConfiguration.getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled() ) {
+							throw new IllegalArgumentException( "XML array '" + columnExpression + "' in '" + aggregateParentReadExpression + "' is not supported with legacy format enabled." );
+						}
+						else {
+							return template.replace(
+									placeholder,
+									caseExpression + "'<Collection>'||xmlextract(" + xmlParentPartExpression + columnExpression + "/*')||'</Collection>' end"
+							);
+						}
+					case UUID:
+						if ( SqlTypes.isBinaryType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
+							return template.replace(
+									placeholder,
+									caseExpression + "hextobin(replace(xmlextractvalue(" + xmlParentPartExpression + columnExpression + "'),'-','')) end"
+							);
+						}
+						// Fall-through intended
+					default:
+						return template.replace(
+								placeholder,
+								caseExpression + "cast(xmlextractvalue(" + xmlParentPartExpression + columnExpression + "') as " + xmlValueReturningType( column, column.getColumnDefinition() ) + ") end"
 						);
 				}
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
-	private static String determineParentPartExpression(String aggregateParentReadExpression) {
+	private static String determineJsonParentPartExpression(String aggregateParentReadExpression) {
 		final String parentPartExpression;
-		if ( aggregateParentReadExpression.startsWith( JSON_QUERY_START ) && aggregateParentReadExpression.endsWith( JSON_QUERY_JSON_END ) ) {
-			parentPartExpression = aggregateParentReadExpression.substring( JSON_QUERY_START.length(), aggregateParentReadExpression.length() - JSON_QUERY_JSON_END.length() ) + ".";
+		if ( aggregateParentReadExpression.startsWith( JSON_QUERY_START ) && aggregateParentReadExpression.endsWith( JSON_QUERY_END ) ) {
+			parentPartExpression = aggregateParentReadExpression.substring( JSON_QUERY_START.length(), aggregateParentReadExpression.length() - JSON_QUERY_END.length() ) + ".";
 		}
 		else {
 			parentPartExpression = aggregateParentReadExpression + ",'$.";
@@ -141,14 +218,22 @@ private static String determineParentPartExpression(String aggregateParentReadEx
 		return parentPartExpression;
 	}
 
-	private static String jsonCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
+	private static String determineXmlParentPartExpression(String aggregateParentReadExpression) {
+		final String parentPartExpression;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START ) && aggregateParentReadExpression.endsWith( XML_EXTRACT_END ) ) {
+			parentPartExpression = aggregateParentReadExpression.substring( XML_EXTRACT_START.length(), aggregateParentReadExpression.length() - XML_EXTRACT_END.length() ) + "/";
+		}
+		else {
+			parentPartExpression = aggregateParentReadExpression + ",'/" + XmlHelper.ROOT_TAG + "/";
+		}
+		return parentPartExpression;
+	}
+
+	private static String customWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
 		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
 		switch ( sqlTypeCode ) {
 			case UUID:
-				if ( !SqlTypes.isBinaryType( jdbcMapping.getJdbcType().getDdlTypeCode() ) ) {
-					return customWriteExpression;
-				}
-				// Fall-through intended
+				return "replace_regexpr('^(.{8})(.{4})(.{4})(.{4})(.{12})$' in lower(bintohex(" + customWriteExpression + ")) with '\\1-\\2-\\3-\\4-\\5')";
 			case BINARY:
 			case VARBINARY:
 			case LONG32VARBINARY:
@@ -173,7 +258,9 @@ public String aggregateComponentAssignmentExpression(
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				// For JSON we always have to replace the whole object
+			case SQLXML:
+			case XML_ARRAY:
+				// For JSON and XML we always have to replace the whole object
 				return aggregateParentAssignmentExpression;
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
@@ -189,24 +276,16 @@ public String aggregateCustomWriteExpression(
 		switch ( sqlTypeCode == SqlTypes.ARRAY ? aggregateColumn.getTypeCode() : sqlTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
+			case SQLXML:
+			case XML_ARRAY:
 				return null;
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumn.getTypeCode() );
 	}
 
-	@Override
-	public int aggregateComponentSqlTypeCode(int aggregateColumnSqlTypeCode, int columnSqlTypeCode) {
-		if ( aggregateColumnSqlTypeCode == JSON ) {
-			return columnSqlTypeCode == ARRAY ? JSON_ARRAY : columnSqlTypeCode;
-		}
-		else {
-			return columnSqlTypeCode;
-		}
-	}
-
 	@Override
 	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
-		return aggregateSqlTypeCode == JSON;
+		return aggregateSqlTypeCode == JSON || aggregateSqlTypeCode == SQLXML;
 	}
 
 	@Override
@@ -217,17 +296,13 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
-				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate );
+				return new RootJsonWriteExpression( aggregateColumn, columnsToUpdate );
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
 
-	private WriteExpressionRenderer jsonAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns) {
-		return new RootJsonWriteExpression( aggregateColumn, columns );
-	}
-
 	interface JsonWriteExpression {
 		boolean isAggregate();
 		void append(
@@ -263,7 +338,7 @@ protected void initializeSubExpressions(SelectableMapping aggregateColumn, Selec
 					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
 					currentAggregate = (AggregateJsonWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
 							parts[i].getSelectableName(),
-							k -> new AggregateJsonWriteExpression( embeddableMappingType.getSelectable( selectableIndex ), columnDefinition )
+							k -> new AggregateJsonWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
 					);
 				}
 				final String customWriteExpression = column.getWriteExpression();
@@ -271,7 +346,7 @@ protected void initializeSubExpressions(SelectableMapping aggregateColumn, Selec
 						parts[parts.length - 1].getSelectableName(),
 						new BasicJsonWriteExpression(
 								column,
-								jsonCustomWriteExpression( customWriteExpression, column.getJdbcMapping() )
+								customWriteExpression( customWriteExpression, column.getJdbcMapping() )
 						)
 				);
 			}
@@ -289,7 +364,7 @@ protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn)
 				if ( jsonWriteExpression == null ) {
 					subExpressions.put(
 							selectableMapping.getSelectableName(),
-							new PassThroughExpression( selectableMapping )
+							new PassThroughJsonWriteExpression( selectableMapping )
 					);
 				}
 				else if ( jsonWriteExpression instanceof AggregateJsonWriteExpression writeExpression ) {
@@ -335,7 +410,7 @@ public void append(
 			sb.append( ')' );
 			if ( aggregateCount != 0 ) {
 				sb.append( ')' );
-				final String parentPartExpression = determineParentPartExpression( path );
+				final String parentPartExpression = determineJsonParentPartExpression( path );
 				String separator = aggregateCount == subExpressions.size() ? " " : ",";
 				for ( Map.Entry<String, JsonWriteExpression> entry : subExpressions.entrySet() ) {
 					final String column = entry.getKey();
@@ -439,11 +514,11 @@ public void append(
 		}
 	}
 
-	private static class PassThroughExpression implements JsonWriteExpression {
+	private static class PassThroughJsonWriteExpression implements JsonWriteExpression {
 
 		private final SelectableMapping selectableMapping;
 
-		PassThroughExpression(SelectableMapping selectableMapping) {
+		PassThroughJsonWriteExpression(SelectableMapping selectableMapping) {
 			this.selectableMapping = selectableMapping;
 		}
 
@@ -458,7 +533,7 @@ public void append(
 				String path,
 				SqlAstTranslator<?> translator,
 				AggregateColumnWriteExpression expression) {
-			final String parentPartExpression = determineParentPartExpression( path );
+			final String parentPartExpression = determineJsonParentPartExpression( path );
 			switch ( selectableMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
 				case BOOLEAN:
 					sb.append( "case json_value(" );
@@ -484,7 +559,7 @@ public void append(
 					sb.append( parentPartExpression );
 					sb.append( selectableMapping.getSelectableName() );
 					sb.append( "' returning " );
-					sb.append( HANAJsonValueFunction.jsonValueReturningType( selectableMapping ) );
+					sb.append( jsonValueReturningType( selectableMapping ) );
 					sb.append( " error on error)" );
 					break;
 				case JSON:
@@ -504,4 +579,326 @@ public void append(
 		}
 	}
 
+	interface XmlWriteExpression {
+		boolean isAggregate();
+		void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression);
+	}
+	private static class AggregateXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String columnDefinition;
+		private final LinkedHashMap<String, XmlWriteExpression> subExpressions = new LinkedHashMap<>();
+
+		private AggregateXmlWriteExpression(SelectableMapping selectableMapping, String columnDefinition) {
+			this.selectableMapping = selectableMapping;
+			this.columnDefinition = columnDefinition;
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return true;
+		}
+
+		protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final SelectablePath[] parts = selectablePath.getParts();
+				AggregateXmlWriteExpression currentAggregate = this;
+				for ( int i = 1; i < parts.length - 1; i++ ) {
+					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) currentAggregate.selectableMapping.getJdbcMapping().getJdbcType();
+					final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
+					currentAggregate = (AggregateXmlWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
+							parts[i].getSelectableName(),
+							k -> new AggregateXmlWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
+					);
+				}
+				final String customWriteExpression = column.getWriteExpression();
+				currentAggregate.subExpressions.put(
+						parts[parts.length - 1].getSelectableName(),
+						new BasicXmlWriteExpression(
+								column,
+								customWriteExpression( customWriteExpression, column.getJdbcMapping() )
+						)
+				);
+			}
+			passThroughUnsetSubExpressions( aggregateColumn );
+		}
+
+		protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn) {
+			final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) aggregateColumn.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
+
+				final XmlWriteExpression xmlWriteExpression = subExpressions.get( selectableMapping.getSelectableName() );
+				if ( xmlWriteExpression == null ) {
+					subExpressions.put(
+							selectableMapping.getSelectableName(),
+							new PassThroughXmlWriteExpression( selectableMapping )
+					);
+				}
+				else if ( xmlWriteExpression instanceof AggregateXmlWriteExpression writeExpression ) {
+					writeExpression.passThroughUnsetSubExpressions( selectableMapping );
+				}
+			}
+		}
+
+		protected String getTagName() {
+			return selectableMapping.getSelectableName();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final int aggregateCount = determineAggregateCount();
+			if ( aggregateCount != 0 ) {
+				sb.append( "(replace_regexpr('^(.*)</" );
+				sb.append( getTagName() );
+				sb.append( ">$' flag 's' in " );
+			}
+
+			sb.append( "(select" );
+			if ( aggregateCount != subExpressions.size() ) {
+				char separator = ' ';
+				for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+					final String column = entry.getKey();
+					final XmlWriteExpression value = entry.getValue();
+					if ( !value.isAggregate() ) {
+						sb.append( separator );
+						value.append( sb, path, translator, expression );
+						sb.append( ' ' );
+						sb.appendDoubleQuoteEscapedString( column );
+						separator = ',';
+					}
+				}
+				sb.append( " from sys.dummy for xml('root'='no','rowname'='" );
+				sb.append( getTagName() );
+				sb.append( "','format'='no','nullstyle'='attribute') returns " );
+				sb.append( columnDefinition );
+			}
+			else {
+				sb.append( " cast('<" );
+				sb.append( getTagName() );
+				sb.append( "></" );
+				sb.append( getTagName() );
+				sb.append( ">' as " );
+				sb.append( columnDefinition );
+				sb.append( ") xmlresult from sys.dummy" );
+			}
+			sb.append( ')' );
+			if ( aggregateCount != 0 ) {
+				sb.append( " with '\\1')" );
+				final String parentPartExpression = determineXmlParentPartExpression( path );
+				for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+					final String column = entry.getKey();
+					final XmlWriteExpression value = entry.getValue();
+					if ( value.isAggregate() ) {
+						sb.append( "||case when " );
+						sb.append( path );
+						sb.append( " is null then null else " );
+						if ( value instanceof AggregateXmlWriteExpression ) {
+							final String subPath = "xmlextract(" + parentPartExpression + column + "')";
+							value.append( sb, subPath, translator, expression );
+						}
+						else {
+							value.append( sb, path, translator, expression );
+						}
+						sb.append( " end" );
+					}
+				}
+				sb.append( "||'</" );
+				sb.append( getTagName() );
+				sb.append( ">')" );
+			}
+		}
+
+		private int determineAggregateCount() {
+			int count = 0;
+			for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+				if ( entry.getValue().isAggregate() ) {
+					count++;
+				}
+			}
+			return count;
+		}
+	}
+
+	private static class RootXmlWriteExpression extends AggregateXmlWriteExpression
+			implements WriteExpressionRenderer {
+		private final String path;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			super( aggregateColumn, aggregateColumn.getColumnDefinition() );
+			path = aggregateColumn.getSelectionExpression();
+			initializeSubExpressions( aggregateColumn, columns );
+		}
+
+		@Override
+		protected String getTagName() {
+			return XmlHelper.ROOT_TAG;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			final String basePath;
+			if ( qualifier == null || qualifier.isBlank() ) {
+				basePath = path;
+			}
+			else {
+				basePath = qualifier + "." + path;
+			}
+			append( sqlAppender, basePath, translator, aggregateColumnWriteExpression );
+		}
+	}
+	private static class BasicXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String customWriteExpressionStart;
+		private final String customWriteExpressionEnd;
+
+		BasicXmlWriteExpression(SelectableMapping selectableMapping, String customWriteExpression) {
+			this.selectableMapping = selectableMapping;
+			if ( customWriteExpression.equals( "?" ) ) {
+				this.customWriteExpressionStart = "";
+				this.customWriteExpressionEnd = "";
+			}
+			else {
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2;
+				this.customWriteExpressionStart = parts[0];
+				this.customWriteExpressionEnd = parts[1];
+			}
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return selectableMapping.getJdbcMapping().getJdbcType().isXml();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final boolean isArray = selectableMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() == XML_ARRAY;
+			if ( isAggregate() ) {
+				sb.append( "coalesce(" );
+			}
+			if ( isArray ) {
+				sb.append( "'<" );
+				sb.append( selectableMapping.getSelectableName() );
+				sb.append( ">'||case when " );
+				sb.append( customWriteExpressionStart );
+				// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+				// since we don't know how the custom write expression looks like where this is embedded,
+				// so we have to be pessimistic and avoid ambiguities
+				translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+				sb.append( customWriteExpressionEnd );
+				sb.append( " is null then null else xmlextract(" );
+			}
+			sb.append( customWriteExpressionStart );
+			// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+			// since we don't know how the custom write expression looks like where this is embedded,
+			// so we have to be pessimistic and avoid ambiguities
+			translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+			sb.append( customWriteExpressionEnd );
+			if ( isArray ) {
+				sb.append( ",'/*/node()') end||'</" );
+				sb.append( selectableMapping.getSelectableName() );
+				sb.append( ">'" );
+			}
+			// Since xmlextractvalue throws an error if a xpath expression doesn't resolve to a node,
+			// insert special null nodes
+			if ( isAggregate() ) {
+				sb.append( ",'<" );
+				sb.append( selectableMapping.getSelectableName() );
+				if ( selectableMapping.getJdbcMapping().getJdbcType() instanceof AggregateJdbcType ) {
+					sb.append( ">" );
+					appendNullTags( sb, selectableMapping );
+					sb.append( "</" );
+					sb.append( selectableMapping.getSelectableName() );
+					sb.append( ">')" );
+				}
+				else {
+					sb.append( "/>')" );
+				}
+			}
+		}
+
+		private void appendNullTags(SqlAppender sb, SelectableMapping parentMapping) {
+			final AggregateJdbcType jdbcType = (AggregateJdbcType) parentMapping.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = jdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectable = embeddableMappingType.getJdbcValueSelectable( i );
+				sb.append( "<" );
+				if ( selectable.getJdbcMapping().getJdbcType() instanceof AggregateJdbcType ) {
+					sb.append( selectable.getSelectableName() );
+					sb.append( ">" );
+					appendNullTags( sb, selectable );
+					sb.append( "</" );
+					sb.append( selectable.getSelectableName() );
+					sb.append( ">" );
+				}
+				else {
+					sb.append( selectable.getSelectableName() );
+					sb.append( "/>" );
+				}
+			}
+		}
+	}
+
+	private static class PassThroughXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+
+		PassThroughXmlWriteExpression(SelectableMapping selectableMapping) {
+			this.selectableMapping = selectableMapping;
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return selectableMapping.getJdbcMapping().getJdbcType().isXml();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final String parentPartExpression = determineXmlParentPartExpression( path );
+			switch ( selectableMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+				case SQLXML:
+				case XML_ARRAY:
+					sb.append( "xmlextract(" );
+					sb.append( parentPartExpression );
+					sb.append( selectableMapping.getSelectableName() );
+					sb.append( "')" );
+					break;
+				default:
+					sb.append( "xmlextractvalue(" );
+					sb.append( parentPartExpression );
+					sb.append( selectableMapping.getSelectableName() );
+					sb.append( "')" );
+					break;
+			}
+		}
+	}
+
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/MySQLAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/MySQLAggregateSupport.java
index 3abbf4cbe5ce..9387d299d44e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/MySQLAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/MySQLAggregateSupport.java
@@ -84,7 +84,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON_ARRAY:
 			case JSON:
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
index 8d41467614e8..531d69040d46 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
@@ -4,17 +4,13 @@
  */
 package org.hibernate.dialect.aggregate;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.OracleArrayJdbcType;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.AggregateColumn;
@@ -27,45 +23,29 @@
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
-import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.StructJdbcType;
 import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+import org.hibernate.type.internal.TypeConfigurationWrapperOptions;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import static org.hibernate.type.SqlTypes.ARRAY;
-import static org.hibernate.type.SqlTypes.BIGINT;
-import static org.hibernate.type.SqlTypes.BINARY;
-import static org.hibernate.type.SqlTypes.BIT;
-import static org.hibernate.type.SqlTypes.BLOB;
-import static org.hibernate.type.SqlTypes.BOOLEAN;
-import static org.hibernate.type.SqlTypes.CLOB;
-import static org.hibernate.type.SqlTypes.DATE;
-import static org.hibernate.type.SqlTypes.INTEGER;
-import static org.hibernate.type.SqlTypes.JSON;
-import static org.hibernate.type.SqlTypes.JSON_ARRAY;
-import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
-import static org.hibernate.type.SqlTypes.NCLOB;
-import static org.hibernate.type.SqlTypes.SMALLINT;
-import static org.hibernate.type.SqlTypes.STRUCT;
-import static org.hibernate.type.SqlTypes.STRUCT_ARRAY;
-import static org.hibernate.type.SqlTypes.STRUCT_TABLE;
-import static org.hibernate.type.SqlTypes.TABLE;
-import static org.hibernate.type.SqlTypes.TIME;
-import static org.hibernate.type.SqlTypes.TIMESTAMP;
-import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
-import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
-import static org.hibernate.type.SqlTypes.TINYINT;
-import static org.hibernate.type.SqlTypes.UUID;
-import static org.hibernate.type.SqlTypes.VARBINARY;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import static org.hibernate.type.SqlTypes.*;
 
 public class OracleAggregateSupport extends AggregateSupportImpl {
 
@@ -79,6 +59,12 @@ public class OracleAggregateSupport extends AggregateSupportImpl {
 	private static final String JSON_QUERY_START = "json_query(";
 	private static final String JSON_QUERY_JSON_END = "' returning json)";
 	private static final String JSON_QUERY_BLOB_END = "' returning blob)";
+	private static final String XML_EXTRACT_START = "xmlelement(\"" + XmlHelper.ROOT_TAG + "\",xmlquery(";
+	private static final String XML_EXTRACT_SEPARATOR = "/*' passing ";
+	private static final String XML_EXTRACT_END = " returning content))";
+	private static final String XML_QUERY_START = "xmlquery(";
+	private static final String XML_QUERY_SEPARATOR = "' passing ";
+	private static final String XML_QUERY_END = " returning content)";
 
 	private final boolean checkConstraintSupport;
 	private final JsonSupport jsonSupport;
@@ -119,7 +105,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
@@ -140,22 +127,24 @@ public String aggregateComponentCustomReadExpression(
 						}
 						switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
 							case BIT:
+							case BOOLEAN:
+								//noinspection unchecked
+								final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) column.getJdbcMapping().getJdbcType()
+										.getJdbcLiteralFormatter( column.getJdbcMapping().getMappedJavaType() );
+								final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
+								final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+								final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
+								final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
 								return template.replace(
 										placeholder,
-										"decode(json_value(" + parentPartExpression + columnExpression + "'),'true',1,'false',0,null)"
+										"decode(json_value(" + parentPartExpression + columnExpression + "'),'true'," + trueLiteral + ",'false'," + falseLiteral + ",null)"
 								);
-							case BOOLEAN:
-								if ( column.getColumnDefinition().toLowerCase( Locale.ROOT ).trim().startsWith( "number" ) ) {
-									return template.replace(
-											placeholder,
-											"decode(json_value(" + parentPartExpression + columnExpression + "'),'true',1,'false',0,null)"
-									);
-								}
-								// Fall-through intended
 							case TINYINT:
 							case SMALLINT:
 							case INTEGER:
 							case BIGINT:
+							case CLOB:
+							case NCLOB:
 								return template.replace(
 										placeholder,
 										"json_value(" + parentPartExpression + columnExpression + "' returning " + column.getColumnDefinition() + ')'
@@ -181,26 +170,29 @@ public String aggregateComponentCustomReadExpression(
 										placeholder,
 										"to_timestamp_tz(json_value(" + parentPartExpression + columnExpression + "'),'YYYY-MM-DD\"T\"hh24:mi:ss.FF9TZH:TZM')"
 								);
-							case BINARY:
-							case VARBINARY:
-							case LONG32VARBINARY:
-								// We encode binary data as hex, so we have to decode here
-								return template.replace(
-										placeholder,
-										"hextoraw(json_value(" + parentPartExpression + columnExpression + "'))"
-								);
 							case UUID:
 								return template.replace(
 										placeholder,
 										"hextoraw(replace(json_value(" + parentPartExpression + columnExpression + "'),'-',''))"
 								);
-							case CLOB:
-							case NCLOB:
+							case BINARY:
+							case VARBINARY:
+							case LONG32VARBINARY:
+								// We encode binary data as hex, so we have to decode here
+								if ( determineLength( column ) * 2 < 4000L ) {
+									return template.replace(
+											placeholder,
+											"hextoraw(json_value(" + parentPartExpression + columnExpression + "'))"
+									);
+								}
+								// Fall-through intended
 							case BLOB:
 								// We encode binary data as hex, so we have to decode here
 								return template.replace(
 										placeholder,
-										"(select * from json_table(" + aggregateParentReadExpression + ",'$' columns (" + columnExpression + " " + column.getColumnDefinition() + " path '$." + columnExpression + "')))"
+										// returning binary data is not yet implemented in the json functions,
+										// so use the xml implementation
+										"xmlcast(xmlcdata(json_value(" + parentPartExpression + columnExpression + "' returning clob))) as " + column.getColumnDefinition() + ')'
 								);
 							case ARRAY:
 								final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) column.getJdbcMapping();
@@ -241,6 +233,83 @@ public String aggregateComponentCustomReadExpression(
 					case NONE:
 						throw new UnsupportedOperationException( "The Oracle version doesn't support JSON aggregates!" );
 				}
+			case SQLXML:
+			case XML_ARRAY:
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case BIT:
+					case BOOLEAN:
+						//noinspection unchecked
+						final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) column.getJdbcMapping().getJdbcType()
+								.getJdbcLiteralFormatter( column.getJdbcMapping().getMappedJavaType() );
+						final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
+						final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+						final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
+						final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
+						return template.replace(
+								placeholder,
+								"decode(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(5)),'true'," + trueLiteral + ",'false'," + falseLiteral + ",null)"
+						);
+					case FLOAT:
+					case REAL:
+					case DOUBLE:
+						// Since cast is the only way to do optional exponential form parsing, we have to use that.
+						// Unfortunately, the parsing is nationalized, so we need to replace the standard decimal separator dot with the nationalized one first
+						return template.replace(
+								placeholder,
+								"cast(replace(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar2(255)),'.',substr(to_char(0.1),1,1)) as " + column.getColumnDefinition() + ")"
+						);
+					case DATE:
+						return template.replace(
+								placeholder,
+								"to_date(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(35)),'YYYY-MM-DD')"
+						);
+					case TIME:
+						return template.replace(
+								placeholder,
+								"to_timestamp(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(35)),'hh24:mi:ss')"
+						);
+					case TIMESTAMP:
+						return template.replace(
+								placeholder,
+								"to_timestamp(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(35)),'YYYY-MM-DD\"T\"hh24:mi:ss.FF9')"
+						);
+					case TIMESTAMP_WITH_TIMEZONE:
+					case TIMESTAMP_UTC:
+						return template.replace(
+								placeholder,
+								"to_timestamp_tz(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(35)),'YYYY-MM-DD\"T\"hh24:mi:ss.FF9TZH:TZM')"
+						);
+					case ARRAY:
+						throw new UnsupportedOperationException( "Transforming XML_ARRAY to native arrays is not supported on Oracle!" );
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								XML_EXTRACT_START + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + "))"
+						);
+					case XML_ARRAY:
+						if ( typeConfiguration.getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled() ) {
+							throw new IllegalArgumentException( "XML array '" + columnExpression + "' in '" + aggregateParentReadExpression + "' is not supported with legacy format enabled." );
+						}
+						else {
+							return template.replace(
+									placeholder,
+									"xmlelement(\"Collection\",xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + "))"
+							);
+						}
+					case UUID:
+						if ( SqlTypes.isBinaryType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
+							return template.replace(
+									placeholder,
+									"hextoraw(replace(xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as varchar(36)),'-',''))"
+							);
+						}
+						// Fall-through intended
+					default:
+						return template.replace(
+								placeholder,
+								"xmlcast(xmlquery(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + ") as " + column.getColumnDefinition() + ")"
+						);
+				}
 			case STRUCT:
 			case STRUCT_ARRAY:
 			case STRUCT_TABLE:
@@ -249,6 +318,58 @@ public String aggregateComponentCustomReadExpression(
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
+	private static String xmlExtractArguments(String aggregateParentReadExpression, String xpathFragment) {
+		final String extractArguments;
+		int separatorIndex;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
+			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
+			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex + 2, aggregateParentReadExpression.length() - 2 );
+			extractArguments = sb.toString();
+		}
+		else if ( aggregateParentReadExpression.startsWith( XML_QUERY_START )
+				&& aggregateParentReadExpression.endsWith( XML_QUERY_END )
+				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_QUERY_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, XML_QUERY_START.length(), separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex, aggregateParentReadExpression.length() - 1 );
+			extractArguments = sb.toString();
+		}
+		else {
+			extractArguments = "'/" + XmlHelper.ROOT_TAG + "/" + xpathFragment + "' passing " + aggregateParentReadExpression + " returning content";
+		}
+		return extractArguments;
+	}
+
+	private static long determineLength(SqlTypedMapping column) {
+		final Long length = column.getLength();
+		if ( length != null ) {
+			return length;
+		}
+		else {
+			final String columnDefinition = column.getColumnDefinition();
+			assert columnDefinition != null;
+			final int parenthesisIndex = columnDefinition.indexOf( '(' );
+			if ( parenthesisIndex != -1 ) {
+				int end;
+				for ( end = parenthesisIndex + 1; end < columnDefinition.length(); end++ ) {
+					if ( !Character.isDigit( columnDefinition.charAt( end ) ) ) {
+						break;
+					}
+				}
+				return Long.parseLong( columnDefinition.substring( parenthesisIndex + 1, end ) );
+			}
+			// Default to the max varchar length
+			return 4000L;
+		}
+	}
+
 	@Override
 	public String aggregateComponentAssignmentExpression(
 			String aggregateParentAssignmentExpression,
@@ -258,7 +379,9 @@ public String aggregateComponentAssignmentExpression(
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				// For JSON we always have to replace the whole object
+			case SQLXML:
+			case XML_ARRAY:
+				// For JSON/XML we always have to replace the whole object
 				return aggregateParentAssignmentExpression;
 			case STRUCT:
 			case STRUCT_ARRAY:
@@ -306,10 +429,14 @@ private String jsonCustomWriteExpression(
 					case BIT:
 						return "decode(" + customWriteExpression + ",1,'true',0,'false',null)";
 					case BOOLEAN:
-						final String sqlTypeName = AbstractSqlAstTranslator.getSqlTypeName( column, typeConfiguration );
-						if ( sqlTypeName.toLowerCase( Locale.ROOT ).trim().startsWith( "number" ) ) {
-							return "decode(" + customWriteExpression + ",1,'true',0,'false',null)";
-						}
+						//noinspection unchecked
+						final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) jdbcMapping.getJdbcType()
+								.getJdbcLiteralFormatter( jdbcMapping.getMappedJavaType() );
+						final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
+						final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+						final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
+						final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
+						return "decode(" + customWriteExpression + "," + trueLiteral + ",'true'," + falseLiteral + ",'false')";
 						// Fall-through intended
 					default:
 						return customWriteExpression;
@@ -318,6 +445,34 @@ private String jsonCustomWriteExpression(
 		throw new IllegalStateException( "JSON not supported!" );
 	}
 
+	private static String xmlCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping, TypeConfiguration typeConfiguration) {
+		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
+		switch ( sqlTypeCode ) {
+			case UUID:
+				return "regexp_replace(lower(rawtohex(" + customWriteExpression + ")),'^(.{8})(.{4})(.{4})(.{4})(.{12})$','\\1-\\2-\\3-\\4-\\5')";
+//			case ARRAY:
+//			case XML_ARRAY:
+//				return "(" + customWriteExpression + ") format json";
+			case BOOLEAN:
+				//noinspection unchecked
+				final JdbcLiteralFormatter<Boolean> jdbcLiteralFormatter = (JdbcLiteralFormatter<Boolean>) jdbcMapping.getJdbcType()
+						.getJdbcLiteralFormatter( jdbcMapping.getMappedJavaType() );
+				final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
+				final WrapperOptions wrapperOptions = new TypeConfigurationWrapperOptions( typeConfiguration );
+				final String trueLiteral = jdbcLiteralFormatter.toJdbcLiteral( true, dialect, wrapperOptions );
+				final String falseLiteral = jdbcLiteralFormatter.toJdbcLiteral( false, dialect, wrapperOptions );
+				return "decode(" + customWriteExpression + "," + trueLiteral + ",'true'," + falseLiteral + ",'false')";
+//			case TIME:
+//				return "varchar_format(timestamp('1970-01-01'," + customWriteExpression + "),'HH24:MI:SS')";
+//			case TIMESTAMP:
+//				return "replace(varchar_format(" + customWriteExpression + ",'YYYY-MM-DD HH24:MI:SS.FF9'),' ','T')";
+//			case TIMESTAMP_UTC:
+//				return "replace(varchar_format(" + customWriteExpression + ",'YYYY-MM-DD HH24:MI:SS.FF9'),' ','T')||'Z'";
+			default:
+				return customWriteExpression;
+		}
+	}
+
 	private static String determineElementTypeName(
 			Size castTargetSize,
 			BasicPluralType<?, ?> pluralType,
@@ -336,7 +491,7 @@ private static String determineElementTypeName(
 
 	@Override
 	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
-		return aggregateSqlTypeCode == JSON;
+		return aggregateSqlTypeCode == JSON || aggregateSqlTypeCode == SQLXML;
 	}
 
 	@Override
@@ -347,7 +502,9 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
-				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate, typeConfiguration );
+				return new RootJsonWriteExpression( aggregateColumn, columnsToUpdate, this, typeConfiguration );
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate, typeConfiguration );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
@@ -380,6 +537,7 @@ public List<AuxiliaryDatabaseObject> aggregateAuxiliaryDatabaseObjects(
 			}
 			arrayType.setElementTypeName( elementJdbcType.getStructTypeName() );
 			arrayType.setElementSqlTypeCode( elementJdbcType.getDefaultSqlTypeCode() );
+			arrayType.setElementDdlTypeCode( elementJdbcType.getDdlTypeCode() );
 		}
 		return super.aggregateAuxiliaryDatabaseObjects(
 				namespace,
@@ -415,13 +573,6 @@ enum JsonSupport {
 		NONE;
 	}
 
-	private WriteExpressionRenderer jsonAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns,
-			TypeConfiguration typeConfiguration) {
-		return new RootJsonWriteExpression( aggregateColumn, columns, this, typeConfiguration );
-	}
-
 	interface JsonWriteExpression {
 		void append(
 				SqlAppender sb,
@@ -614,4 +765,198 @@ public void append(
 		}
 	}
 
+	interface XmlWriteExpression {
+		void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression);
+	}
+	private static class AggregateXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String columnDefinition;
+		private final LinkedHashMap<String, XmlWriteExpression> subExpressions = new LinkedHashMap<>();
+
+		private AggregateXmlWriteExpression(SelectableMapping selectableMapping, String columnDefinition) {
+			this.selectableMapping = selectableMapping;
+			this.columnDefinition = columnDefinition;
+		}
+
+		protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns, TypeConfiguration typeConfiguration) {
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final SelectablePath[] parts = selectablePath.getParts();
+				AggregateXmlWriteExpression currentAggregate = this;
+				for ( int i = 1; i < parts.length - 1; i++ ) {
+					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) currentAggregate.selectableMapping.getJdbcMapping().getJdbcType();
+					final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
+					currentAggregate = (AggregateXmlWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
+							parts[i].getSelectableName(),
+							k -> new AggregateXmlWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
+					);
+				}
+				final String customWriteExpression = column.getWriteExpression();
+				currentAggregate.subExpressions.put(
+						parts[parts.length - 1].getSelectableName(),
+						new BasicXmlWriteExpression(
+								column,
+								xmlCustomWriteExpression( customWriteExpression, column.getJdbcMapping(), typeConfiguration )
+						)
+				);
+			}
+			passThroughUnsetSubExpressions( aggregateColumn );
+		}
+
+		protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn) {
+			final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) aggregateColumn.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
+
+				final XmlWriteExpression xmlWriteExpression = subExpressions.get( selectableMapping.getSelectableName() );
+				if ( xmlWriteExpression == null ) {
+					subExpressions.put(
+							selectableMapping.getSelectableName(),
+							new PassThroughXmlWriteExpression( selectableMapping )
+					);
+				}
+				else if ( xmlWriteExpression instanceof AggregateXmlWriteExpression writeExpression ) {
+					writeExpression.passThroughUnsetSubExpressions( selectableMapping );
+				}
+			}
+		}
+
+		protected String getTagName() {
+			return selectableMapping.getSelectableName();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "xmlelement(" );
+			sb.appendDoubleQuoteEscapedString( getTagName() );
+			sb.append( ",xmlconcat" );
+			char separator = '(';
+			for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+				sb.append( separator );
+
+				final XmlWriteExpression value = entry.getValue();
+				if ( value instanceof AggregateXmlWriteExpression ) {
+					final String subPath = "xmlquery(" + xmlExtractArguments( path, entry.getKey() ) + ")";
+					value.append( sb, subPath, translator, expression );
+				}
+				else {
+					value.append( sb, path, translator, expression );
+				}
+				separator = ',';
+			}
+			sb.append( "))" );
+		}
+	}
+
+	private static class RootXmlWriteExpression extends AggregateXmlWriteExpression
+			implements WriteExpressionRenderer {
+		private final String path;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns, TypeConfiguration typeConfiguration) {
+			super( aggregateColumn, aggregateColumn.getColumnDefinition() );
+			path = aggregateColumn.getSelectionExpression();
+			initializeSubExpressions( aggregateColumn, columns, typeConfiguration );
+		}
+
+		@Override
+		protected String getTagName() {
+			return XmlHelper.ROOT_TAG;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			final String basePath;
+			if ( qualifier == null || qualifier.isBlank() ) {
+				basePath = path;
+			}
+			else {
+				basePath = qualifier + "." + path;
+			}
+			append( sqlAppender, "xmlquery('/" + getTagName() + "' passing " + basePath + " returning content)", translator, aggregateColumnWriteExpression );
+		}
+	}
+	private static class BasicXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String[] customWriteExpressionParts;
+
+		BasicXmlWriteExpression(SelectableMapping selectableMapping, String customWriteExpression) {
+			this.selectableMapping = selectableMapping;
+			if ( customWriteExpression.equals( "?" ) ) {
+				this.customWriteExpressionParts = new String[]{ "", "" };
+			}
+			else {
+				assert !customWriteExpression.startsWith( "?" );
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2 || (parts.length & 1) == 1;
+				this.customWriteExpressionParts = parts;
+			}
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final JdbcType jdbcType = selectableMapping.getJdbcMapping().getJdbcType();
+			final boolean isArray = jdbcType.getDefaultSqlTypeCode() == XML_ARRAY;
+			sb.append( "xmlelement(" );
+			sb.appendDoubleQuoteEscapedString( selectableMapping.getSelectableName() );
+			sb.append( ',' );
+			if ( isArray ) {
+				// Remove the <Collection> tag to wrap the value into the selectable specific tag
+				sb.append( "xmlquery('/Collection/*' passing " );
+			}
+			sb.append( customWriteExpressionParts[0] );
+			for ( int i = 1; i < customWriteExpressionParts.length; i++ ) {
+				// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+				// since we don't know how the custom write expression looks like where this is embedded,
+				// so we have to be pessimistic and avoid ambiguities
+				translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+				sb.append( customWriteExpressionParts[i] );
+			}
+			if ( isArray ) {
+				sb.append( " returning content)" );
+			}
+			sb.append( ')' );
+		}
+	}
+
+	private static class PassThroughXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+
+		PassThroughXmlWriteExpression(SelectableMapping selectableMapping) {
+			this.selectableMapping = selectableMapping;
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "xmlquery(" );
+			sb.append( xmlExtractArguments( path, selectableMapping.getSelectableName() ) );
+			sb.append( ")" );
+		}
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
index 3b6cc39553ed..a9743f0f26ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
@@ -8,8 +8,10 @@
 import java.util.Map;
 
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.Column;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SelectablePath;
@@ -18,6 +20,8 @@
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.type.SqlTypes.ARRAY;
@@ -31,16 +35,25 @@
 import static org.hibernate.type.SqlTypes.JSON_ARRAY;
 import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
 import static org.hibernate.type.SqlTypes.SMALLINT;
+import static org.hibernate.type.SqlTypes.SQLXML;
 import static org.hibernate.type.SqlTypes.STRUCT;
 import static org.hibernate.type.SqlTypes.STRUCT_ARRAY;
 import static org.hibernate.type.SqlTypes.STRUCT_TABLE;
 import static org.hibernate.type.SqlTypes.TINYINT;
 import static org.hibernate.type.SqlTypes.VARBINARY;
+import static org.hibernate.type.SqlTypes.XML_ARRAY;
 
 public class PostgreSQLAggregateSupport extends AggregateSupportImpl {
 
 	private static final AggregateSupport INSTANCE = new PostgreSQLAggregateSupport();
 
+	private static final String XML_EXTRACT_START = "xmlelement(name \"" + XmlHelper.ROOT_TAG + "\",(select xmlagg(t.v) from xmltable(";
+	private static final String XML_EXTRACT_SEPARATOR = "/*' passing ";
+	private static final String XML_EXTRACT_END = " columns v xml path '.')t))";
+	private static final String XML_QUERY_START = "(select xmlagg(t.v) from xmltable(";
+	private static final String XML_QUERY_SEPARATOR = "' passing ";
+	private static final String XML_QUERY_END = " columns v xml path '.')t)";
+
 	public static AggregateSupport valueOf(Dialect dialect) {
 		return PostgreSQLAggregateSupport.INSTANCE;
 	}
@@ -52,7 +65,8 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON_ARRAY:
 			case JSON:
@@ -108,6 +122,40 @@ public String aggregateComponentCustomReadExpression(
 								"cast(" + aggregateParentReadExpression + "->>'" + columnExpression + "' as " + column.getColumnDefinition() + ')'
 						);
 				}
+			case XML_ARRAY:
+			case SQLXML:
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								XML_EXTRACT_START + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + XML_EXTRACT_END
+						);
+					case XML_ARRAY:
+						if ( typeConfiguration.getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled() ) {
+							throw new IllegalArgumentException( "XML array '" + columnExpression + "' in '" + aggregateParentReadExpression + "' is not supported with legacy format enabled." );
+						}
+						else {
+							return template.replace(
+									placeholder,
+									"xmlelement(name \"Collection\",(select xmlagg(t.v order by t.i) from xmltable(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/*" ) + " columns v xml path '.', i for ordinality)t))"
+							);
+						}
+					case BINARY:
+					case VARBINARY:
+					case LONG32VARBINARY:
+						// We encode binary data as hex, so we have to decode here
+						return template.replace(
+								placeholder,
+								"decode((select t.v from xmltable(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression )+ " columns v text path '.') t),'hex')"
+						);
+					case ARRAY:
+						throw new UnsupportedOperationException( "Transforming XML_ARRAY to native arrays is not supported on PostgreSQL!" );
+					default:
+						return template.replace(
+								placeholder,
+								"(select t.v from xmltable(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression ) + " columns v " + column.getColumnDefinition() + " path '.') t)"
+						);
+				}
 			case STRUCT:
 			case STRUCT_ARRAY:
 			case STRUCT_TABLE:
@@ -116,6 +164,35 @@ public String aggregateComponentCustomReadExpression(
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
+	private static String xmlExtractArguments(String aggregateParentReadExpression, String xpathFragment) {
+		final String extractArguments;
+		int separatorIndex;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
+			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
+			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex + 2, aggregateParentReadExpression.length() - XML_EXTRACT_END.length() );
+			extractArguments = sb.toString();
+		}
+		else if ( aggregateParentReadExpression.startsWith( XML_QUERY_START )
+				&& aggregateParentReadExpression.endsWith( XML_QUERY_END )
+				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_QUERY_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, XML_QUERY_START.length(), separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex, aggregateParentReadExpression.length() - XML_QUERY_END.length() );
+			extractArguments = sb.toString();
+		}
+		else {
+			extractArguments = "'/" + XmlHelper.ROOT_TAG + "/" + xpathFragment + "' passing " + aggregateParentReadExpression;
+		}
+		return extractArguments;
+	}
+
 	private static String jsonCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
 		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
 		switch ( sqlTypeCode ) {
@@ -140,6 +217,30 @@ private static String jsonCustomWriteExpression(String customWriteExpression, Jd
 		}
 	}
 
+	private static String xmlCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
+		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
+		switch ( sqlTypeCode ) {
+			case BINARY:
+			case VARBINARY:
+			case LONG32VARBINARY:
+				// We encode binary data as hex
+				return "encode(" + customWriteExpression + ",'hex')";
+//			case ARRAY:
+//				final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) jdbcMapping;
+//				switch ( pluralType.getElementType().getJdbcType().getDefaultSqlTypeCode() ) {
+//					case BINARY:
+//					case VARBINARY:
+//					case LONG32VARBINARY:
+//						// We encode binary data as hex
+//						return "to_jsonb(array(select encode(unnest(" + customWriteExpression + "),'hex')))";
+//					default:
+//						return "to_jsonb(" + customWriteExpression + ")";
+//				}
+			default:
+				return customWriteExpression;
+		}
+	}
+
 	@Override
 	public String aggregateComponentAssignmentExpression(
 			String aggregateParentAssignmentExpression,
@@ -149,7 +250,9 @@ public String aggregateComponentAssignmentExpression(
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				// For JSON we always have to replace the whole object
+			case SQLXML:
+			case XML_ARRAY:
+				// For JSON/XML we always have to replace the whole object
 				return aggregateParentAssignmentExpression;
 			case STRUCT:
 			case STRUCT_ARRAY:
@@ -163,6 +266,7 @@ public String aggregateComponentAssignmentExpression(
 	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
+			case SQLXML:
 				return true;
 		}
 		return false;
@@ -182,17 +286,13 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
-				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate );
+				return new RootJsonWriteExpression( aggregateColumn, columnsToUpdate );
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
 
-	private WriteExpressionRenderer jsonAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns) {
-		return new RootJsonWriteExpression( aggregateColumn, columns );
-	}
-
 	interface JsonWriteExpression {
 		void append(
 				SqlAppender sb,
@@ -328,4 +428,198 @@ public void append(
 		}
 	}
 
+	interface XmlWriteExpression {
+		void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression);
+	}
+	private static class AggregateXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String columnDefinition;
+		private final LinkedHashMap<String, XmlWriteExpression> subExpressions = new LinkedHashMap<>();
+
+		private AggregateXmlWriteExpression(SelectableMapping selectableMapping, String columnDefinition) {
+			this.selectableMapping = selectableMapping;
+			this.columnDefinition = columnDefinition;
+		}
+
+		protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final SelectablePath[] parts = selectablePath.getParts();
+				AggregateXmlWriteExpression currentAggregate = this;
+				for ( int i = 1; i < parts.length - 1; i++ ) {
+					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) currentAggregate.selectableMapping.getJdbcMapping().getJdbcType();
+					final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
+					currentAggregate = (AggregateXmlWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
+							parts[i].getSelectableName(),
+							k -> new AggregateXmlWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
+					);
+				}
+				final String customWriteExpression = column.getWriteExpression();
+				currentAggregate.subExpressions.put(
+						parts[parts.length - 1].getSelectableName(),
+						new BasicXmlWriteExpression(
+								column,
+								xmlCustomWriteExpression( customWriteExpression, column.getJdbcMapping() )
+						)
+				);
+			}
+			passThroughUnsetSubExpressions( aggregateColumn );
+		}
+
+		protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn) {
+			final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) aggregateColumn.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
+
+				final XmlWriteExpression xmlWriteExpression = subExpressions.get( selectableMapping.getSelectableName() );
+				if ( xmlWriteExpression == null ) {
+					subExpressions.put(
+							selectableMapping.getSelectableName(),
+							new PassThroughXmlWriteExpression( selectableMapping )
+					);
+				}
+				else if ( xmlWriteExpression instanceof AggregateXmlWriteExpression writeExpression ) {
+					writeExpression.passThroughUnsetSubExpressions( selectableMapping );
+				}
+			}
+		}
+
+		protected String getTagName() {
+			return selectableMapping.getSelectableName();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "xmlelement(name " );
+			sb.appendDoubleQuoteEscapedString( getTagName() );
+			sb.append( ",xmlconcat" );
+			char separator = '(';
+			for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+				sb.append( separator );
+
+				final XmlWriteExpression value = entry.getValue();
+				if ( value instanceof AggregateXmlWriteExpression ) {
+					final String subPath = XML_QUERY_START + xmlExtractArguments( path, entry.getKey() ) + XML_QUERY_END;
+					value.append( sb, subPath, translator, expression );
+				}
+				else {
+					value.append( sb, path, translator, expression );
+				}
+				separator = ',';
+			}
+			sb.append( "))" );
+		}
+	}
+
+	private static class RootXmlWriteExpression extends AggregateXmlWriteExpression
+			implements WriteExpressionRenderer {
+		private final String path;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			super( aggregateColumn, aggregateColumn.getColumnDefinition() );
+			path = aggregateColumn.getSelectionExpression();
+			initializeSubExpressions( aggregateColumn, columns );
+		}
+
+		@Override
+		protected String getTagName() {
+			return XmlHelper.ROOT_TAG;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			final String basePath;
+			if ( qualifier == null || qualifier.isBlank() ) {
+				basePath = path;
+			}
+			else {
+				basePath = qualifier + "." + path;
+			}
+			append( sqlAppender, XML_QUERY_START + "'/" + getTagName() + "' passing " + basePath + XML_QUERY_END, translator, aggregateColumnWriteExpression );
+		}
+	}
+	private static class BasicXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String[] customWriteExpressionParts;
+
+		BasicXmlWriteExpression(SelectableMapping selectableMapping, String customWriteExpression) {
+			this.selectableMapping = selectableMapping;
+			if ( customWriteExpression.equals( "?" ) ) {
+				this.customWriteExpressionParts = new String[]{ "", "" };
+			}
+			else {
+				assert !customWriteExpression.startsWith( "?" );
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2 || (parts.length & 1) == 1;
+				this.customWriteExpressionParts = parts;
+			}
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final JdbcType jdbcType = selectableMapping.getJdbcMapping().getJdbcType();
+			final boolean isArray = jdbcType.getDefaultSqlTypeCode() == XML_ARRAY;
+			sb.append( "xmlelement(name " );
+			sb.appendDoubleQuoteEscapedString( selectableMapping.getSelectableName() );
+			sb.append( ',' );
+			if ( isArray ) {
+				// Remove the <Collection> tag to wrap the value into the selectable specific tag
+				sb.append( "(select xmlagg(t.v order by t.i) from xmltable('/Collection/*' passing " );
+			}
+			sb.append( customWriteExpressionParts[0] );
+			for ( int i = 1; i < customWriteExpressionParts.length; i++ ) {
+				// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+				// since we don't know how the custom write expression looks like where this is embedded,
+				// so we have to be pessimistic and avoid ambiguities
+				translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+				sb.append( customWriteExpressionParts[i] );
+			}
+			if ( isArray ) {
+				sb.append( " columns v xml path '.', i for ordinality)t)" );
+			}
+			sb.append( ')' );
+		}
+	}
+
+	private static class PassThroughXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+
+		PassThroughXmlWriteExpression(SelectableMapping selectableMapping) {
+			this.selectableMapping = selectableMapping;
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( XML_QUERY_START );
+			sb.append( xmlExtractArguments( path, selectableMapping.getSelectableName() ) );
+			sb.append( XML_QUERY_END );
+		}
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SQLServerAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SQLServerAggregateSupport.java
index ab065459ecec..149cc1cdf0aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SQLServerAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SQLServerAggregateSupport.java
@@ -5,7 +5,7 @@
 package org.hibernate.dialect.aggregate;
 
 import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.Size;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.Column;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
@@ -16,12 +16,8 @@
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
-import org.hibernate.type.BasicPluralType;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
-import org.hibernate.type.descriptor.sql.DdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.util.LinkedHashMap;
@@ -31,19 +27,26 @@
 
 public class SQLServerAggregateSupport extends AggregateSupportImpl {
 
-	private static final AggregateSupport INSTANCE = new SQLServerAggregateSupport();
+	private static final AggregateSupport JSON_INSTANCE = new SQLServerAggregateSupport( true );
+	private static final AggregateSupport LEGACY_INSTANCE = new SQLServerAggregateSupport( false );
 
 	private static final String JSON_QUERY_START = "json_query(";
 	private static final String JSON_QUERY_JSON_END = "')";
 	private static final int JSON_VALUE_MAX_LENGTH = 4000;
+	private static final String XML_QUERY_START = "cast('<e>'+cast(";
+	private static final String XML_QUERY_SEPARATOR = ".query('";
+	private static final String XML_QUERY_END = "/*') as nvarchar(max))+'</e>' as xml)";
 
-	private SQLServerAggregateSupport() {
+	private final boolean supportsJson;
+
+	private SQLServerAggregateSupport(boolean supportsJson) {
+		this.supportsJson = supportsJson;
 	}
 
 	public static AggregateSupport valueOf(Dialect dialect) {
 		return dialect.getVersion().isSameOrAfter( 13 )
-				? SQLServerAggregateSupport.INSTANCE
-				: AggregateSupportImpl.INSTANCE;
+				? SQLServerAggregateSupport.JSON_INSTANCE
+				: SQLServerAggregateSupport.LEGACY_INSTANCE;
 	}
 
 	@Override
@@ -53,24 +56,28 @@ public String aggregateComponentCustomReadExpression(
 			String aggregateParentReadExpression,
 			String columnExpression,
 			int aggregateColumnTypeCode,
-			SqlTypedMapping column) {
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				final String parentPartExpression;
+				if ( !supportsJson ) {
+					break;
+				}
+				final String parentJsonPartExpression;
 				if ( aggregateParentReadExpression.startsWith( JSON_QUERY_START )
 						&& aggregateParentReadExpression.endsWith( JSON_QUERY_JSON_END ) ) {
-					parentPartExpression = aggregateParentReadExpression.substring( JSON_QUERY_START.length(), aggregateParentReadExpression.length() - JSON_QUERY_JSON_END.length() ) + ".";
+					parentJsonPartExpression = aggregateParentReadExpression.substring( JSON_QUERY_START.length(), aggregateParentReadExpression.length() - JSON_QUERY_JSON_END.length() ) + ".";
 				}
 				else {
-					parentPartExpression = aggregateParentReadExpression + ",'$.";
+					parentJsonPartExpression = aggregateParentReadExpression + ",'$.";
 				}
 				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
 					case JSON:
 					case JSON_ARRAY:
 						return template.replace(
 								placeholder,
-								"json_query(" + parentPartExpression + columnExpression + "')"
+								"json_query(" + parentJsonPartExpression + columnExpression + "')"
 						);
 					case BINARY:
 					case VARBINARY:
@@ -87,7 +94,7 @@ public String aggregateComponentCustomReadExpression(
 						else {
 							return template.replace(
 									placeholder,
-									"convert(" + column.getColumnDefinition() + ",json_value(" + parentPartExpression + columnExpression + "'),2)"
+									"convert(" + column.getColumnDefinition() + ",json_value(" + parentJsonPartExpression + columnExpression + "'),2)"
 							);
 						}
 					case CHAR:
@@ -124,7 +131,7 @@ public String aggregateComponentCustomReadExpression(
 					case TIMESTAMP_WITH_TIMEZONE:
 						return template.replace(
 								placeholder,
-								"cast(json_value(" + parentPartExpression + columnExpression + "') as " + column.getColumnDefinition() + ")"
+								"cast(json_value(" + parentJsonPartExpression + columnExpression + "') as " + column.getColumnDefinition() + ")"
 						);
 					default:
 						return template.replace(
@@ -132,6 +139,47 @@ public String aggregateComponentCustomReadExpression(
 								"(select * from openjson(" + aggregateParentReadExpression + ") with (v " + column.getColumnDefinition() + " '$." + columnExpression + "'))"
 						);
 				}
+			case SQLXML:
+			case XML_ARRAY:
+				final String xmlColumn;
+				final String parentXmlPartExpression;
+				final int queryIndex;
+				if ( aggregateParentReadExpression.startsWith( XML_QUERY_START )
+					&& aggregateParentReadExpression.endsWith( XML_QUERY_END )
+					&& (queryIndex = aggregateParentReadExpression.indexOf( XML_QUERY_SEPARATOR )) != -1 ) {
+					xmlColumn = aggregateParentReadExpression.substring( XML_QUERY_START.length(), queryIndex );
+					parentXmlPartExpression = aggregateParentReadExpression.substring( queryIndex + XML_QUERY_SEPARATOR.length(), aggregateParentReadExpression.length() - XML_QUERY_END.length() );
+				}
+				else {
+					xmlColumn = aggregateParentReadExpression;
+					parentXmlPartExpression = "/" + XmlHelper.ROOT_TAG;
+				}
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								XML_QUERY_START + xmlColumn + XML_QUERY_SEPARATOR + parentXmlPartExpression + "/" + columnExpression + XML_QUERY_END
+						);
+					case XML_ARRAY:
+						return template.replace(
+								placeholder,
+								"cast('<Collection>'+cast(" + xmlColumn + XML_QUERY_SEPARATOR + parentXmlPartExpression + "/" + columnExpression + "/*') as nvarchar(max))+'</Collection>' as xml)"
+						);
+					case BINARY:
+					case VARBINARY:
+					case LONG32VARBINARY:
+					case BLOB:
+						// We encode binary data as hex, so we have to decode here
+						return template.replace(
+								placeholder,
+								"convert(" + column.getColumnDefinition() + "," + xmlColumn + ".value('(" + parentXmlPartExpression + "/" + columnExpression + "/text())[1]','nvarchar(max)'),2)"
+						);
+					default:
+						return template.replace(
+								placeholder,
+								xmlColumn + ".value('(" + parentXmlPartExpression + "/" + columnExpression + "/text())[1]','" + column.getColumnDefinition() + "')"
+						);
+				}
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
@@ -168,17 +216,18 @@ public String aggregateComponentAssignmentExpression(
 		switch ( aggregateColumnTypeCode ) {
 			case JSON:
 			case JSON_ARRAY:
-				// For JSON we always have to replace the whole object
+				if ( !supportsJson ) {
+					break;
+				}
+			case SQLXML:
+			case XML_ARRAY:
+				// For JSON/XML we always have to replace the whole object
 				return aggregateParentAssignmentExpression;
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
 	}
 
-	private String jsonCustomWriteExpression(
-			String customWriteExpression,
-			JdbcMapping jdbcMapping,
-			SelectableMapping column,
-			TypeConfiguration typeConfiguration) {
+	private static String jsonCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
 		switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
 			case BINARY:
 			case VARBINARY:
@@ -204,25 +253,35 @@ private String jsonCustomWriteExpression(
 		}
 	}
 
-	private static String determineElementTypeName(
-			Size castTargetSize,
-			BasicPluralType<?, ?> pluralType,
-			TypeConfiguration typeConfiguration) {
-		final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-		final BasicType<?> expressionType = pluralType.getElementType();
-		DdlType ddlType = ddlTypeRegistry.getDescriptor( expressionType.getJdbcType().getDdlTypeCode() );
-		if ( ddlType == null ) {
-			// this may happen when selecting a null value like `SELECT null from ...`
-			// some dbs need the value to be cast so not knowing the real type we fall back to INTEGER
-			ddlType = ddlTypeRegistry.getDescriptor( SqlTypes.INTEGER );
+	private static String xmlCustomWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
+		switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
+			case BOOLEAN:
+			case BIT:
+				return "case " + customWriteExpression + " when 1 then 'true' when 0 then 'false' end";
+			case BINARY:
+			case VARBINARY:
+			case LONG32VARBINARY:
+			case BLOB:
+				return "convert(nvarchar(max)," + customWriteExpression + ",2)";
+			case TIME:
+				return "left(" + customWriteExpression + ",8)";
+			case DATE:
+				return "format(" + customWriteExpression + ",'yyyy-MM-dd')";
+			case TIMESTAMP:
+				return "format(" + customWriteExpression + ",'yyyy-MM-ddTHH:mm:ss.fffffff')";
+			case TIMESTAMP_UTC:
+			case TIMESTAMP_WITH_TIMEZONE:
+				return "format(" + customWriteExpression + ",'yyyy-MM-ddTHH:mm:ss.fffffffzzz')";
+			case UUID:
+				return "cast(" + customWriteExpression + " as nvarchar(36))";
+			default:
+				return customWriteExpression;
 		}
-
-		return ddlType.getTypeName( castTargetSize, expressionType, ddlTypeRegistry );
 	}
 
 	@Override
 	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
-		return aggregateSqlTypeCode == JSON;
+		return aggregateSqlTypeCode == JSON || aggregateSqlTypeCode == SQLXML;
 	}
 
 	@Override
@@ -233,18 +292,16 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
-				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate, typeConfiguration );
+				if ( !supportsJson ) {
+					break;
+				}
+				return new RootJsonWriteExpression( aggregateColumn, columnsToUpdate, this, typeConfiguration );
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
 
-	private WriteExpressionRenderer jsonAggregateColumnWriter(
-			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns,
-			TypeConfiguration typeConfiguration) {
-		return new RootJsonWriteExpression( aggregateColumn, columns, this, typeConfiguration );
-	}
-
 	interface JsonWriteExpression {
 		void append(
 				SqlAppender sb,
@@ -287,9 +344,7 @@ protected void initializeSubExpressions(
 								column,
 								aggregateSupport.jsonCustomWriteExpression(
 										customWriteExpression,
-										column.getJdbcMapping(),
-										column,
-										typeConfiguration
+										column.getJdbcMapping()
 								)
 						)
 				);
@@ -398,4 +453,199 @@ public void append(
 		}
 	}
 
+	interface XmlWriteExpression {
+		void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression);
+	}
+	private static class AggregateXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String columnDefinition;
+		private final LinkedHashMap<String, XmlWriteExpression> subExpressions = new LinkedHashMap<>();
+
+		private AggregateXmlWriteExpression(SelectableMapping selectableMapping, String columnDefinition) {
+			this.selectableMapping = selectableMapping;
+			this.columnDefinition = columnDefinition;
+		}
+
+		protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final SelectablePath[] parts = selectablePath.getParts();
+				AggregateXmlWriteExpression currentAggregate = this;
+				for ( int i = 1; i < parts.length - 1; i++ ) {
+					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) currentAggregate.selectableMapping.getJdbcMapping().getJdbcType();
+					final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
+					currentAggregate = (AggregateXmlWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
+							parts[i].getSelectableName(),
+							k -> new AggregateXmlWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
+					);
+				}
+				final String customWriteExpression = column.getWriteExpression();
+				currentAggregate.subExpressions.put(
+						parts[parts.length - 1].getSelectableName(),
+						new BasicXmlWriteExpression(
+								column,
+								xmlCustomWriteExpression( customWriteExpression, column.getJdbcMapping() )
+						)
+				);
+			}
+			passThroughUnsetSubExpressions( aggregateColumn );
+		}
+
+		protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn) {
+			final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) aggregateColumn.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
+
+				final XmlWriteExpression xmlWriteExpression = subExpressions.get( selectableMapping.getSelectableName() );
+				if ( xmlWriteExpression == null ) {
+					subExpressions.put(
+							selectableMapping.getSelectableName(),
+							new PassThroughXmlWriteExpression( selectableMapping )
+					);
+				}
+				else if ( xmlWriteExpression instanceof AggregateXmlWriteExpression writeExpression ) {
+					writeExpression.passThroughUnsetSubExpressions( selectableMapping );
+				}
+			}
+		}
+
+		protected String getTagName() {
+			return selectableMapping.getSelectableName();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "(select" );
+			char separator = ' ';
+			for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+				sb.append( separator );
+
+				final XmlWriteExpression value = entry.getValue();
+				if ( value instanceof AggregateXmlWriteExpression ) {
+					final String queryPrefix = path.substring( 0, path.length() - "')".length() );
+					final String subPath = queryPrefix + "/" + entry.getKey() + "')";
+					value.append( sb, subPath, translator, expression );
+				}
+				else {
+					value.append( sb, path, translator, expression );
+				}
+				separator = ',';
+			}
+			sb.append( " for xml path(" );
+			sb.appendSingleQuoteEscapedString( getTagName() );
+			sb.append( "),type)" );
+		}
+	}
+
+	private static class RootXmlWriteExpression extends AggregateXmlWriteExpression
+			implements WriteExpressionRenderer {
+		private final String path;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			super( aggregateColumn, aggregateColumn.getColumnDefinition() );
+			path = aggregateColumn.getSelectionExpression();
+			initializeSubExpressions( aggregateColumn, columns );
+		}
+
+		@Override
+		protected String getTagName() {
+			return XmlHelper.ROOT_TAG;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			final String basePath;
+			if ( qualifier == null || qualifier.isBlank() ) {
+				basePath = path;
+			}
+			else {
+				basePath = qualifier + "." + path;
+			}
+			append( sqlAppender, basePath + ".query('/" + getTagName() + "')", translator, aggregateColumnWriteExpression );
+		}
+	}
+	private static class BasicXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String[] customWriteExpressionParts;
+
+		BasicXmlWriteExpression(SelectableMapping selectableMapping, String customWriteExpression) {
+			this.selectableMapping = selectableMapping;
+			if ( customWriteExpression.equals( "?" ) ) {
+				this.customWriteExpressionParts = new String[]{ "", "" };
+			}
+			else {
+				assert !customWriteExpression.startsWith( "?" );
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2 || (parts.length & 1) == 1;
+				this.customWriteExpressionParts = parts;
+			}
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final JdbcType jdbcType = selectableMapping.getJdbcMapping().getJdbcType();
+			final boolean isArray = jdbcType.getDefaultSqlTypeCode() == XML_ARRAY;
+			if ( isArray ) {
+				sb.append( '(' );
+			}
+			sb.append( customWriteExpressionParts[0] );
+			for ( int i = 1; i < customWriteExpressionParts.length; i++ ) {
+				// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+				// since we don't know how the custom write expression looks like where this is embedded,
+				// so we have to be pessimistic and avoid ambiguities
+				translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+				sb.append( customWriteExpressionParts[i] );
+			}
+			if ( isArray ) {
+				// Remove the <Collection> tag to wrap the value into the selectable specific tag
+				sb.append( ").query('/Collection/*')" );
+			}
+			sb.append( ' ' );
+			sb.appendDoubleQuoteEscapedString( selectableMapping.getSelectableName() );
+		}
+	}
+
+	private static class PassThroughXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+
+		PassThroughXmlWriteExpression(SelectableMapping selectableMapping) {
+			this.selectableMapping = selectableMapping;
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			assert path.endsWith( "')" );
+			sb.append( path, 0, path.length() - 2 );
+			sb.append( '/' );
+			sb.append( selectableMapping.getSelectableName() );
+			sb.append( "')" );
+		}
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java
new file mode 100644
index 000000000000..f0ed451cdc49
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java
@@ -0,0 +1,541 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.aggregate;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.XmlHelper;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.AggregateColumn;
+import org.hibernate.mapping.Column;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.SelectablePath;
+import org.hibernate.metamodel.mapping.SqlTypedMapping;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hibernate.type.SqlTypes.BINARY;
+import static org.hibernate.type.SqlTypes.BLOB;
+import static org.hibernate.type.SqlTypes.BOOLEAN;
+import static org.hibernate.type.SqlTypes.CHAR;
+import static org.hibernate.type.SqlTypes.CLOB;
+import static org.hibernate.type.SqlTypes.DATE;
+import static org.hibernate.type.SqlTypes.LONG32NVARCHAR;
+import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
+import static org.hibernate.type.SqlTypes.LONG32VARCHAR;
+import static org.hibernate.type.SqlTypes.NCHAR;
+import static org.hibernate.type.SqlTypes.NCLOB;
+import static org.hibernate.type.SqlTypes.NVARCHAR;
+import static org.hibernate.type.SqlTypes.SQLXML;
+import static org.hibernate.type.SqlTypes.TIME;
+import static org.hibernate.type.SqlTypes.TIMESTAMP;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
+import static org.hibernate.type.SqlTypes.UUID;
+import static org.hibernate.type.SqlTypes.VARBINARY;
+import static org.hibernate.type.SqlTypes.VARCHAR;
+import static org.hibernate.type.SqlTypes.XML_ARRAY;
+
+/**
+ * Sybase ASE supports the {@code xmlextract()} function which is used to implement aggregate support.
+ * One notable quirk of Sybase ASE that causes a lot of ugly code is that a SQL {@code NULL} in string concatenation
+ * is treated as empty string and hence does not produce {@code NULL}.
+ * So in order to get correct results, it is necessary to wrap concatenation expressions with case expressions,
+ * that ensure {@code NULL} is produced if any of the concatenation expressions is {@code NULL}.
+ */
+public class SybaseASEAggregateSupport extends AggregateSupportImpl {
+
+	private static final AggregateSupport INSTANCE = new SybaseASEAggregateSupport();
+
+	private static final String XML_EXTRACT_START = "xmlextract(";
+	private static final String XML_EXTRACT_SEPARATOR = "/*',";
+	private static final String XML_EXTRACT_SIMPLE_SEPARATOR = "',";
+	private static final String XML_EXTRACT_END = ")";
+	private static final String XML_EXTRACT_READ_START = "case when ";
+	private static final String XML_EXTRACT_READ_NULL_CHECK = " is null then null else ";
+	private static final String XML_EXTRACT_READ_INVOCATION_START = "'<" + XmlHelper.ROOT_TAG + ">'+xmlextract(";
+	private static final String XML_EXTRACT_READ_END = " returns varchar(16384))+'</" + XmlHelper.ROOT_TAG + ">' end";
+
+	private SybaseASEAggregateSupport() {
+	}
+
+	public static AggregateSupport valueOf(Dialect dialect) {
+		return INSTANCE;
+	}
+
+	@Override
+	public boolean supportsComponentCheckConstraints() {
+		return false;
+	}
+
+	@Override
+	public String aggregateComponentCustomReadExpression(
+			String template,
+			String placeholder,
+			String aggregateParentReadExpression,
+			String columnExpression,
+			int aggregateColumnTypeCode,
+			SqlTypedMapping column,
+			TypeConfiguration typeConfiguration) {
+		switch ( aggregateColumnTypeCode ) {
+			case SQLXML:
+			case XML_ARRAY:
+				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
+					case BINARY:
+					case VARBINARY:
+					case LONG32VARBINARY:
+					case BLOB:
+						// We encode binary data as hex, so we have to decode here
+						return template.replace(
+								placeholder,
+								"strtobin(xmlextract(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + " returns varchar(16384)))"
+						);
+					case DATE:
+					case TIME:
+					case TIMESTAMP:
+					case TIMESTAMP_UTC:
+						// Cast from clob to varchar first
+						return template.replace(
+								placeholder,
+								"cast(str_replace(xmlextract(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + " returns varchar(36)),'Z','') as " + column.getColumnDefinition() + ")"
+						);
+					case SQLXML:
+						return template.replace(
+								placeholder,
+								xmlExtractForConcat( "'<" + XmlHelper.ROOT_TAG + ">'+", aggregateParentReadExpression, columnExpression + "/*", "+'</" + XmlHelper.ROOT_TAG + ">'" )
+						);
+					case XML_ARRAY:
+						if ( typeConfiguration.getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled() ) {
+							throw new IllegalArgumentException( "XML array '" + columnExpression + "' in '" + aggregateParentReadExpression + "' is not supported with legacy format enabled." );
+						}
+						else {
+							return template.replace(
+									placeholder,
+									xmlExtractForConcat( "'<Collection>'+", aggregateParentReadExpression, columnExpression + "/*", "+'</Collection>'" )
+							);
+						}
+					case CHAR:
+					case NCHAR:
+					case VARCHAR:
+					case NVARCHAR:
+					case LONG32VARCHAR:
+					case LONG32NVARCHAR:
+					case CLOB:
+					case NCLOB:
+						// xmlextract() unfortunately does not resolve XML entities, so we use str_replace to do that
+						return template.replace(
+								placeholder,
+								"cast(str_replace(str_replace(str_replace(str_replace(xmlextract(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + " returns varchar(16384)),'&lt;','<'),'&gt;','>'),'&quot;','\"'),'&amp;','&') as " + column.getColumnDefinition() + ")"
+						);
+					case UUID:
+						if ( SqlTypes.isBinaryType( column.getJdbcMapping().getJdbcType().getDdlTypeCode() ) ) {
+							return template.replace(
+									placeholder,
+									"strtobin(str_replace(xmlextract(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + " returns varchar(36)),'-',null))"
+							);
+						}
+						// Fall-through intended
+					default:
+						return template.replace(
+								placeholder,
+								"cast(xmlextract(" + xmlExtractArguments( aggregateParentReadExpression, columnExpression + "/text()" ) + " returns varchar(16384)) as " + column.getColumnDefinition() + ")"
+						);
+				}
+		}
+		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
+	}
+
+	private static String xmlExtractArguments(String aggregateParentReadExpression, String xpathFragment) {
+		final String extractArguments;
+		final int separatorIndex;
+		final int patternIdx;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_READ_START )
+			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_READ_END )
+			&& (patternIdx = aggregateParentReadExpression.indexOf( XML_EXTRACT_READ_NULL_CHECK )) != -1
+			&& aggregateParentReadExpression.regionMatches( patternIdx + XML_EXTRACT_READ_NULL_CHECK.length(),
+				XML_EXTRACT_READ_INVOCATION_START, 0, XML_EXTRACT_READ_INVOCATION_START.length() )) {
+			final int argumentsStartIndex = patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() + XML_EXTRACT_READ_INVOCATION_START.length();
+			separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR );
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, argumentsStartIndex, separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex + 2, aggregateParentReadExpression.length() - XML_EXTRACT_READ_END.length() );
+			extractArguments = sb.toString();
+		}
+		else if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
+			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
+			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SIMPLE_SEPARATOR )) != -1 ) {
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			final int xpathEnd;
+			if ( aggregateParentReadExpression.regionMatches( separatorIndex - 2, XML_EXTRACT_SEPARATOR, 0, XML_EXTRACT_SEPARATOR.length() ) ) {
+				xpathEnd = separatorIndex - 2;
+			}
+			else {
+				xpathEnd = separatorIndex;
+			}
+			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), xpathEnd );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex, aggregateParentReadExpression.length() - 1 );
+			extractArguments = sb.toString();
+		}
+		else {
+			extractArguments = "'/" + XmlHelper.ROOT_TAG + "/" + xpathFragment + "'," + aggregateParentReadExpression;
+		}
+		return extractArguments;
+	}
+
+	private static String xmlExtractForConcat(String prefix, String aggregateParentReadExpression, String xpathFragment, String suffix) {
+		final String extractArguments;
+		final int patternIdx;
+		final String caseExpression;
+		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_READ_START )
+			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_READ_END )
+			&& (patternIdx = aggregateParentReadExpression.indexOf( XML_EXTRACT_READ_NULL_CHECK )) != -1
+			&& aggregateParentReadExpression.regionMatches( patternIdx + XML_EXTRACT_READ_NULL_CHECK.length(),
+				XML_EXTRACT_READ_INVOCATION_START, 0, XML_EXTRACT_READ_INVOCATION_START.length() )) {
+			caseExpression = aggregateParentReadExpression.substring( 0, patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() );
+			final int argumentsStartIndex = patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() + XML_EXTRACT_READ_INVOCATION_START.length();
+			final int separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR );
+			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
+			sb.append( aggregateParentReadExpression, argumentsStartIndex, separatorIndex );
+			sb.append( '/' );
+			sb.append( xpathFragment );
+			sb.append( aggregateParentReadExpression, separatorIndex + 2, aggregateParentReadExpression.length() - XML_EXTRACT_READ_END.length() );
+			extractArguments = sb.toString();
+		}
+		else {
+			caseExpression = XML_EXTRACT_READ_START + aggregateParentReadExpression + XML_EXTRACT_READ_NULL_CHECK;
+			extractArguments = "'/" + XmlHelper.ROOT_TAG + "/" + xpathFragment + "'," + aggregateParentReadExpression;
+		}
+		return caseExpression + prefix + XML_EXTRACT_START + extractArguments + " returns varchar(16384)" + XML_EXTRACT_END + suffix + " end";
+	}
+
+	private static String customWriteExpression(String customWriteExpression, JdbcMapping jdbcMapping) {
+		final int sqlTypeCode = jdbcMapping.getJdbcType().getDefaultSqlTypeCode();
+		switch ( sqlTypeCode ) {
+			case UUID:
+				return "stuff(stuff(stuff(stuff(lower(bintostr(" + customWriteExpression + ")),9,0,'-'),14,0,'-'),19,0,'-'),24,0,'-')";
+			case BOOLEAN:
+				return "case " + customWriteExpression + " when 1 then 'true' when 0 then 'false' end";
+			case BINARY:
+			case VARBINARY:
+			case LONG32VARBINARY:
+			case BLOB:
+				// We encode binary data as hex
+				return "bintostr(" + customWriteExpression + ")";
+			case DATE:
+				return "left(convert(varchar," + customWriteExpression + ",140),10)";
+			case TIME:
+				return "left(convert(varchar," + customWriteExpression + ",20),8)";
+			case TIMESTAMP:
+				return "str_replace(convert(varchar," + customWriteExpression + ",140),' ','T')";
+			case TIMESTAMP_UTC:
+				return "nullif(str_replace(convert(varchar," + customWriteExpression + ",140),' ','T')+'Z','Z')";
+			default:
+				return customWriteExpression;
+		}
+	}
+
+	@Override
+	public String aggregateComponentAssignmentExpression(
+			String aggregateParentAssignmentExpression,
+			String columnExpression,
+			int aggregateColumnTypeCode,
+			Column column) {
+		switch ( aggregateColumnTypeCode ) {
+			case SQLXML:
+			case XML_ARRAY:
+				// For JSON and XML we always have to replace the whole object
+				return aggregateParentAssignmentExpression;
+		}
+		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
+	}
+
+	@Override
+	public String aggregateCustomWriteExpression(
+			AggregateColumn aggregateColumn,
+			List<Column> aggregatedColumns) {
+		// We need to know what array this is XML_ARRAY,
+		// which we can easily get from the type code of the aggregate column
+		final int sqlTypeCode = aggregateColumn.getType().getJdbcType().getDefaultSqlTypeCode();
+		switch ( sqlTypeCode == SqlTypes.ARRAY ? aggregateColumn.getTypeCode() : sqlTypeCode ) {
+			case SQLXML:
+			case XML_ARRAY:
+				return null;
+		}
+		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumn.getTypeCode() );
+	}
+
+	@Override
+	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
+		return aggregateSqlTypeCode == SQLXML;
+	}
+
+	@Override
+	public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
+			SelectableMapping aggregateColumn,
+			SelectableMapping[] columnsToUpdate,
+			TypeConfiguration typeConfiguration) {
+		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
+		switch ( aggregateSqlTypeCode ) {
+			case SQLXML:
+				return new RootXmlWriteExpression( aggregateColumn, columnsToUpdate );
+		}
+		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
+	}
+
+	interface XmlWriteExpression {
+		boolean isAggregate();
+		void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression);
+	}
+	private static class AggregateXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String columnDefinition;
+		private final LinkedHashMap<String, XmlWriteExpression> subExpressions = new LinkedHashMap<>();
+
+		private AggregateXmlWriteExpression(SelectableMapping selectableMapping, String columnDefinition) {
+			this.selectableMapping = selectableMapping;
+			this.columnDefinition = columnDefinition;
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return true;
+		}
+
+		protected void initializeSubExpressions(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			for ( SelectableMapping column : columns ) {
+				final SelectablePath selectablePath = column.getSelectablePath();
+				final SelectablePath[] parts = selectablePath.getParts();
+				AggregateXmlWriteExpression currentAggregate = this;
+				for ( int i = 1; i < parts.length - 1; i++ ) {
+					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) currentAggregate.selectableMapping.getJdbcMapping().getJdbcType();
+					final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+					final int selectableIndex = embeddableMappingType.getSelectableIndex( parts[i].getSelectableName() );
+					currentAggregate = (AggregateXmlWriteExpression) currentAggregate.subExpressions.computeIfAbsent(
+							parts[i].getSelectableName(),
+							k -> new AggregateXmlWriteExpression( embeddableMappingType.getJdbcValueSelectable( selectableIndex ), columnDefinition )
+					);
+				}
+				final String customWriteExpression = column.getWriteExpression();
+				currentAggregate.subExpressions.put(
+						parts[parts.length - 1].getSelectableName(),
+						new BasicXmlWriteExpression(
+								column,
+								customWriteExpression( customWriteExpression, column.getJdbcMapping() )
+						)
+				);
+			}
+			passThroughUnsetSubExpressions( aggregateColumn );
+		}
+
+		protected void passThroughUnsetSubExpressions(SelectableMapping aggregateColumn) {
+			final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) aggregateColumn.getJdbcMapping().getJdbcType();
+			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+			final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
+			for ( int i = 0; i < jdbcValueCount; i++ ) {
+				final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
+
+				final XmlWriteExpression xmlWriteExpression = subExpressions.get( selectableMapping.getSelectableName() );
+				if ( xmlWriteExpression == null ) {
+					subExpressions.put(
+							selectableMapping.getSelectableName(),
+							new PassThroughXmlWriteExpression( selectableMapping )
+					);
+				}
+				else if ( xmlWriteExpression instanceof AggregateXmlWriteExpression writeExpression ) {
+					writeExpression.passThroughUnsetSubExpressions( selectableMapping );
+				}
+			}
+		}
+
+		protected String getTagName() {
+			return selectableMapping.getSelectableName();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "'<" );
+			sb.append( getTagName() );
+			sb.append( ">'" );
+			for ( Map.Entry<String, XmlWriteExpression> entry : subExpressions.entrySet() ) {
+				final String column = entry.getKey();
+				final XmlWriteExpression value = entry.getValue();
+				sb.append( "+coalesce(" );
+				if ( value instanceof AggregateXmlWriteExpression ) {
+					final String subPath = "xmlextract(" + xmlExtractArguments( path, column ) + ")";
+					value.append( sb, subPath, translator, expression );
+				}
+				else {
+					value.append( sb, path, translator, expression );
+				}
+				sb.append( ",'<" );
+				sb.append( column );
+				sb.append( "/>')" );
+			}
+			sb.append( "+'</" );
+			sb.append( getTagName() );
+			sb.append( ">'" );
+		}
+	}
+
+	private static class RootXmlWriteExpression extends AggregateXmlWriteExpression
+			implements WriteExpressionRenderer {
+		private final String path;
+
+		RootXmlWriteExpression(SelectableMapping aggregateColumn, SelectableMapping[] columns) {
+			super( aggregateColumn, aggregateColumn.getColumnDefinition() );
+			path = aggregateColumn.getSelectionExpression();
+			initializeSubExpressions( aggregateColumn, columns );
+		}
+
+		@Override
+		protected String getTagName() {
+			return XmlHelper.ROOT_TAG;
+		}
+
+		@Override
+		public void render(
+				SqlAppender sqlAppender,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression aggregateColumnWriteExpression,
+				String qualifier) {
+			final String basePath;
+			if ( qualifier == null || qualifier.isBlank() ) {
+				basePath = path;
+			}
+			else {
+				basePath = qualifier + "." + path;
+			}
+			append( sqlAppender, basePath, translator, aggregateColumnWriteExpression );
+		}
+	}
+	private static class BasicXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+		private final String[] customWriteExpressionParts;
+
+		BasicXmlWriteExpression(SelectableMapping selectableMapping, String customWriteExpression) {
+			this.selectableMapping = selectableMapping;
+			if ( customWriteExpression.equals( "?" ) ) {
+				this.customWriteExpressionParts = new String[]{ "", "" };
+			}
+			else {
+				assert !customWriteExpression.startsWith( "?" );
+				final String[] parts = StringHelper.split( "?", customWriteExpression );
+				assert parts.length == 2 || (parts.length & 1) == 1;
+				this.customWriteExpressionParts = parts;
+			}
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return selectableMapping.getJdbcMapping().getJdbcType().isXml();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			final JdbcType jdbcType = selectableMapping.getJdbcMapping().getJdbcType();
+			final boolean isArray = jdbcType.getDefaultSqlTypeCode() == XML_ARRAY;
+			final boolean isString = jdbcType.isStringLike();
+			sb.append( "case when " );
+			translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+			sb.append( " is null then null else '<" );
+			sb.append( selectableMapping.getSelectableName() );
+			sb.append( ">'+" );
+			if ( isArray ) {
+				// Remove the <Collection> tag to wrap the value into the selectable specific tag
+				sb.append( "xmlextract('/Collection/*'," );
+			}
+			else if ( isString ) {
+				// Need to escape certain characters in XML content
+				sb.append( "str_replace(str_replace(str_replace(" );
+				if ( jdbcType.isLobOrLong() ) {
+					// str_replace doesn't work with LOBs, so need to cast here
+					sb.append( "cast(" );
+				}
+			}
+			else {
+				sb.append( "cast(" );
+			}
+			sb.append( customWriteExpressionParts[0] );
+			for ( int i = 1; i < customWriteExpressionParts.length; i++ ) {
+				// We use NO_UNTYPED here so that expressions which require type inference are casted explicitly,
+				// since we don't know how the custom write expression looks like where this is embedded,
+				// so we have to be pessimistic and avoid ambiguities
+				translator.render( expression.getValueExpression( selectableMapping ), SqlAstNodeRenderingMode.NO_UNTYPED );
+				sb.append( customWriteExpressionParts[i] );
+			}
+			if ( isArray ) {
+				sb.append( " returns varchar(16384))" );
+			}
+			else if ( isString ) {
+				if ( jdbcType.isLobOrLong() ) {
+					sb.append( " as varchar(16384))" );
+				}
+				sb.append( ",'&','&amp;'),'<','&lt;'),'>','&gt;')" );
+			}
+			else {
+				sb.append( " as varchar(16384))" );
+			}
+			sb.append( "+'</" );
+			sb.append( selectableMapping.getSelectableName() );
+			sb.append( ">' end" );
+		}
+	}
+
+	private static class PassThroughXmlWriteExpression implements XmlWriteExpression {
+
+		private final SelectableMapping selectableMapping;
+
+		PassThroughXmlWriteExpression(SelectableMapping selectableMapping) {
+			this.selectableMapping = selectableMapping;
+		}
+
+		@Override
+		public boolean isAggregate() {
+			return selectableMapping.getJdbcMapping().getJdbcType().isXml();
+		}
+
+		@Override
+		public void append(
+				SqlAppender sb,
+				String path,
+				SqlAstTranslator<?> translator,
+				AggregateColumnWriteExpression expression) {
+			sb.append( "xmlextract(" );
+			sb.append( xmlExtractArguments( path, selectableMapping.getSelectableName() ) );
+			// This expression is always going to be concatenated
+			// Since concatenation doesn't support LOBs, ensure a varchar is returned
+			sb.append( " returns varchar(16384))" );
+		}
+	}
+
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
index bc926434ad3e..4bb275393f88 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
@@ -5,6 +5,7 @@
 package org.hibernate.dialect.function.array;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
@@ -14,6 +15,7 @@
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 
 
 /**
@@ -54,7 +56,8 @@ protected void renderJsonTable(
 						"t.v",
 						selectableMapping.getSelectableName(),
 						SqlTypes.JSON,
-						selectableMapping
+						selectableMapping,
+						walker.getSessionFactory().getTypeConfiguration()
 				) );
 			}
 			sqlAppender.append( " as " );
@@ -70,4 +73,27 @@ protected void renderJsonTable(
 			sqlAppender.appendSql( " t(v))" );
 		}
 	}
+
+	protected void renderXmlTable(
+			SqlAppender sqlAppender,
+			Expression array,
+			BasicPluralType<?, ?> pluralType,
+			@Nullable SqlTypedMapping sqlTypedMapping,
+			AnonymousTupleTableGroupProducer tupleType,
+			String tableIdentifierVariable,
+			SqlAstTranslator<?> walker) {
+		final XmlHelper.CollectionTags collectionTags = XmlHelper.determineCollectionTags(
+				(BasicPluralJavaType<?>) pluralType.getJavaTypeDescriptor(), walker.getSessionFactory()
+		);
+
+		sqlAppender.appendSql( "xmltable('/" );
+		sqlAppender.appendSql( collectionTags.rootName() );
+		sqlAppender.appendSql( '/' );
+		sqlAppender.appendSql( collectionTags.elementName() );
+		sqlAppender.appendSql( "' passing " );
+		array.accept( walker );
+		sqlAppender.appendSql( " columns" );
+		renderXmlTableColumns( sqlAppender, tupleType, walker );
+		sqlAppender.appendSql( ')' );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
index 989d88ac9d07..527dc0472bb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
@@ -126,9 +126,9 @@ protected void renderXmlTable(
 					sqlAppender.appendSql( selectableMapping.getSelectionExpression() );
 				}
 				else {
-					sqlAppender.appendSql( "t.v.value('");
+					sqlAppender.appendSql( "t.v.value('(");
 					sqlAppender.appendSql( selectableMapping.getSelectableName() );
-					sqlAppender.appendSql( "/text()[1]','" );
+					sqlAppender.appendSql( "/text())[1]','" );
 					sqlAppender.append( getDdlType( selectableMapping, SqlTypes.XML_ARRAY, walker ) );
 					sqlAppender.appendSql( "') " );
 					sqlAppender.appendSql( selectableMapping.getSelectionExpression() );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
index f70e4bf6f566..563a1adec37b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
@@ -162,6 +162,11 @@ protected void renderXmlTable(
 		sqlAppender.appendSql( "' passing " );
 		array.accept( walker );
 		sqlAppender.appendSql( " as \"d\" columns" );
+		renderXmlTableColumns( sqlAppender, tupleType, walker );
+		sqlAppender.appendSql( ')' );
+	}
+
+	protected void renderXmlTableColumns(SqlAppender sqlAppender, AnonymousTupleTableGroupProducer tupleType, SqlAstTranslator<?> walker) {
 		if ( tupleType.findSubPart( CollectionPart.Nature.ELEMENT.getName(), null ) == null ) {
 			tupleType.forEachSelectable( 0, (selectionIndex, selectableMapping) -> {
 				if ( selectionIndex == 0 ) {
@@ -205,8 +210,6 @@ protected void renderXmlTable(
 				}
 			} );
 		}
-
-		sqlAppender.appendSql( ')' );
 	}
 
 	protected void renderUnnest(
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
index 78ce92e5a92d..460416cd5d0d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SelectablePath;
+import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart;
 import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl;
@@ -382,10 +383,17 @@ else if ( isParameter( documentExpression ) ) {
 
 	@Override
 	protected String determineColumnType(CastTarget castTarget, SqlAstTranslator<?> walker) {
-		final String typeName = super.determineColumnType( castTarget, walker );
-		return switch ( typeName ) {
+		return xmlValueReturningType( castTarget, super.determineColumnType( castTarget, walker ) );
+	}
+
+	public static String xmlValueReturningType(SqlTypedMapping column, String columnDefinition) {
+		final int parenthesisIndex = columnDefinition.indexOf( '(' );
+		final String baseName = parenthesisIndex == -1
+				? columnDefinition
+				: columnDefinition.substring( 0, parenthesisIndex );
+		return switch ( baseName ) {
 			// xmltable doesn't support tinyint. Usually it is a boolean, but if not, use "integer"
-			case "tinyint" -> isBoolean( castTarget.getJdbcMapping() ) ? "varchar(5)" : "integer";
+			case "tinyint" -> isBoolean( column.getJdbcMapping() ) ? "varchar(5)" : "integer";
 			// Also, smallint isn't supported
 			case "smallint" -> "integer";
 			// For boolean, use varchar since that decoding is done through a read expression
@@ -394,7 +402,7 @@ protected String determineColumnType(CastTarget castTarget, SqlAstTranslator<?>
 			case "float" -> "double";
 			// Clobs are also not supported, so use the biggest nvarchar possible
 			case "clob", "nclob" -> "nvarchar(5000)";
-			default -> typeName;
+			default -> columnDefinition;
 		};
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
index c26d70fb2ed4..ebda038f62e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/UserDefinedArrayType.java
@@ -17,6 +17,7 @@ public class UserDefinedArrayType extends AbstractUserDefinedType {
 	private Integer arraySqlTypeCode;
 	private String elementTypeName;
 	private Integer elementSqlTypeCode;
+	private Integer elementDdlTypeCode;
 	private Integer arrayLength;
 
 	public UserDefinedArrayType(String contributor, Namespace namespace, Identifier physicalTypeName) {
@@ -47,6 +48,14 @@ public void setElementSqlTypeCode(Integer elementSqlTypeCode) {
 		this.elementSqlTypeCode = elementSqlTypeCode;
 	}
 
+	public Integer getElementDdlTypeCode() {
+		return elementDdlTypeCode;
+	}
+
+	public void setElementDdlTypeCode(Integer elementDdlTypeCode) {
+		this.elementDdlTypeCode = elementDdlTypeCode;
+	}
+
 	public Integer getArrayLength() {
 		return arrayLength;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
index 7c5babc93ade..4c970e8c9b47 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/CastType.java
@@ -35,6 +35,7 @@ public enum CastType {
 	DATE, TIME, TIMESTAMP,
 	OFFSET_TIMESTAMP, ZONE_TIMESTAMP,
 	JSON,
+	XML,
 	NULL,
 	OTHER;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
index 4341b40f17fe..a5d316db6ecd 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
@@ -207,7 +207,7 @@ private boolean isArray(AggregateColumn aggregateColumn) {
 		return false;
 	}
 
-	private void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+	protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
 		final AggregateSupport aggregateSupport = dialect.getAggregateSupport();
 		final int checkStart = buf.length();
 		buf.append( ", check (" );
@@ -279,7 +279,8 @@ else if ( aggregateColumn.isNullable() ) {
 							subColumnName,
 							aggregatePath,
 							subColumnName,
-							aggregateColumn, subColumn
+							aggregateColumn,
+							subColumn
 					);
 					if ( !subColumn.isNullable() ) {
 						buf.append( separator );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
index d41e91085967..a3973660c445 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
@@ -48,10 +48,21 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 				return new DelayedStructJdbcType( this, structName );
 			}
 		}
-		// prefer json by default for now
-		final JdbcType descriptor = context.getJdbcType( SqlTypes.JSON );
-		if ( descriptor != null ) {
-			return descriptor;
+		// When the column is mapped as XML array, the component type must be SQLXML
+		if ( context.getExplicitJdbcTypeCode() != null && context.getExplicitJdbcTypeCode() == SqlTypes.XML_ARRAY
+			// Also prefer XML is the Dialect prefers XML arrays
+			|| context.getDialect().getPreferredSqlTypeCodeForArray() == SqlTypes.XML_ARRAY ) {
+			final JdbcType descriptor = context.getJdbcType( SqlTypes.SQLXML );
+			if ( descriptor != null ) {
+				return descriptor;
+			}
+		}
+		else {
+			// Otherwise use json by default for now
+			final JdbcType descriptor = context.getJdbcType( SqlTypes.JSON );
+			if ( descriptor != null ) {
+				return descriptor;
+			}
 		}
 		throw new JdbcTypeRecommendationException(
 				"Could not determine recommended JdbcType for `" + getTypeName() + "`"
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
index e901f181f036..c54cc3959a4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DelegatingJdbcTypeIndicators.java
@@ -111,6 +111,22 @@ public int resolveJdbcTypeCode(int jdbcTypeCode) {
 		return delegate.resolveJdbcTypeCode( jdbcTypeCode );
 	}
 
+	@Override
+	@Incubating
+	public boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return delegate.isXmlFormatMapperLegacyFormatEnabled();
+	}
+
+	@Override
+	public boolean preferJdbcDatetimeTypes() {
+		return delegate.preferJdbcDatetimeTypes();
+	}
+
+	@Override
+	public int getPreferredSqlTypeCodeForArray(int elementSqlTypeCode) {
+		return delegate.getPreferredSqlTypeCodeForArray( elementSqlTypeCode );
+	}
+
 	@Override
 	public TypeConfiguration getTypeConfiguration() {
 		return delegate.getTypeConfiguration();
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
index af6b38062af7..25c2fd5c57e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
@@ -350,6 +350,9 @@ static CastType getCastType(int typeCode) {
 			case JSON:
 			case JSON_ARRAY:
 				return CastType.JSON;
+			case SQLXML:
+			case XML_ARRAY:
+				return CastType.XML;
 			case NULL:
 				return CastType.NULL;
 			default:
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
index e4dfbb7989d4..c1cb4be189a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
@@ -239,6 +239,17 @@ default boolean preferJdbcDatetimeTypes() {
 		return false;
 	}
 
+	/**
+	 * Whether to use the legacy format for serializing/deserializing XML data.
+	 *
+	 * @since 7.0
+	 * @see org.hibernate.cfg.MappingSettings#XML_FORMAT_MAPPER_LEGACY_FORMAT
+	 */
+	@Incubating
+	default boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return getCurrentBaseSqlTypeIndicators().isXmlFormatMapperLegacyFormatEnabled();
+	}
+
 	/**
 	 * Provides access to the {@link TypeConfiguration} for access to various type system related registries.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonArrayBlobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonArrayBlobJdbcType.java
index 372c7f582d1c..8cd8c2fe791b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonArrayBlobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/OracleJsonArrayBlobJdbcType.java
@@ -34,6 +34,11 @@ public int getJdbcTypeCode() {
 		return SqlTypes.BLOB;
 	}
 
+	@Override
+	public int getDdlTypeCode() {
+		return SqlTypes.BLOB;
+	}
+
 	@Override
 	public String toString() {
 		return "JsonArrayBlobJdbcType";
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
index 0b480fe6808f..a1aa28bfc0ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
@@ -10,10 +10,13 @@
 import java.sql.SQLException;
 import java.sql.SQLXML;
 
+import org.hibernate.dialect.XmlHelper;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
@@ -65,42 +68,26 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 			//noinspection unchecked
 			return (X) sqlxml;
 		}
-		return options.getSessionFactory().getFastSessionServices().getXmlFormatMapper().fromString(
-				string,
-				javaType,
-				options
-		);
+		return XmlHelper.arrayFromString( javaType, this, string, options );
 	}
 
 	protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions options) {
-		return options.getSessionFactory().getFastSessionServices().getXmlFormatMapper().toString(
-				value,
-				javaType,
-				options
-		);
+		final JdbcType elementJdbcType = getElementJdbcType();
+		final Object[] domainObjects = javaType.unwrap( value, Object[].class, options );
+		if ( elementJdbcType instanceof XmlJdbcType xmlElementJdbcType ) {
+			final EmbeddableMappingType embeddableMappingType = xmlElementJdbcType.getEmbeddableMappingType();
+			return XmlHelper.arrayToString( embeddableMappingType, domainObjects, options );
+		}
+		else {
+			assert !( elementJdbcType instanceof AggregateJdbcType );
+			final JavaType<?> elementJavaType = ( (BasicPluralJavaType<?>) javaType ).getElementJavaType();
+			return XmlHelper.arrayToString( elementJavaType, elementJdbcType, domainObjects, options );
+		}
 	}
 
 	@Override
 	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
-		return new BasicBinder<>( javaType, this ) {
-			@Override
-			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
-					throws SQLException {
-				final String xml = ( (XmlArrayJdbcType ) getJdbcType() ).toString( value, getJavaType(), options );
-				SQLXML sqlxml = st.getConnection().createSQLXML();
-				sqlxml.setString( xml );
-				st.setSQLXML( index, sqlxml );
-			}
-
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final String xml = ( (XmlArrayJdbcType ) getJdbcType() ).toString( value, getJavaType(), options );
-				SQLXML sqlxml = st.getConnection().createSQLXML();
-				sqlxml.setString( xml );
-				st.setSQLXML( name, sqlxml );
-			}
-		};
+		return new XmlArrayBinder<>( javaType, this );
 	}
 
 	@Override
@@ -134,4 +121,28 @@ private X getObject(SQLXML sqlxml, WrapperOptions options) throws SQLException {
 
 		};
 	}
+
+	protected static class XmlArrayBinder<X> extends BasicBinder<X> {
+		public XmlArrayBinder(JavaType<X> javaType, XmlArrayJdbcType jdbcType) {
+			super( javaType, jdbcType );
+		}
+
+		@Override
+		protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+				throws SQLException {
+			final String xml = ( (XmlArrayJdbcType) getJdbcType() ).toString( value, getJavaType(), options );
+			SQLXML sqlxml = st.getConnection().createSQLXML();
+			sqlxml.setString( xml );
+			st.setSQLXML( index, sqlxml );
+		}
+
+		@Override
+		protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+				throws SQLException {
+			final String xml = ( (XmlArrayJdbcType ) getJdbcType() ).toString( value, getJavaType(), options );
+			SQLXML sqlxml = st.getConnection().createSQLXML();
+			sqlxml.setString( xml );
+			st.setSQLXML( name, sqlxml );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
index 647e238cbb72..5834ec2098d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
@@ -77,7 +77,7 @@ public Object[] extractJdbcValues(Object rawJdbcValue, WrapperOptions options) t
 		return XmlHelper.fromString( embeddableMappingType, (String) rawJdbcValue, false, options );
 	}
 
-	protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions options) {
+	protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions options) throws SQLException {
 		if ( embeddableMappingType != null ) {
 			return XmlHelper.toString( embeddableMappingType, value, options );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
index 3f39583ab77d..01f9425d19f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
@@ -13,6 +13,7 @@ public final class JacksonIntegration {
 	private static final boolean JACKSON_XML_AVAILABLE = ableToLoadJacksonXMLMapper();
 	private static final boolean JACKSON_JSON_AVAILABLE = ableToLoadJacksonJSONMapper();
 	private static final JacksonXmlFormatMapper XML_FORMAT_MAPPER = JACKSON_XML_AVAILABLE ? new JacksonXmlFormatMapper() : null;
+	private static final JacksonXmlFormatMapper XML_FORMAT_MAPPER_PORTABLE = JACKSON_XML_AVAILABLE ? new JacksonXmlFormatMapper( false ) : null;
 	private static final JacksonJsonFormatMapper JSON_FORMAT_MAPPER = JACKSON_JSON_AVAILABLE ? new JacksonJsonFormatMapper() : null;
 
 	private JacksonIntegration() {
@@ -31,6 +32,10 @@ public static FormatMapper getXMLJacksonFormatMapperOrNull() {
 		return XML_FORMAT_MAPPER;
 	}
 
+	public static FormatMapper getXMLJacksonFormatMapperOrNull(boolean legacyFormat) {
+		return legacyFormat ? XML_FORMAT_MAPPER : XML_FORMAT_MAPPER_PORTABLE;
+	}
+
 	public static FormatMapper getJsonJacksonFormatMapperOrNull() {
 		return JSON_FORMAT_MAPPER;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
index a841535f570b..16211d742dcc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java
@@ -5,11 +5,25 @@
 package org.hibernate.type.format.jackson;
 
 import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.format.FormatMapper;
 
 import com.fasterxml.jackson.core.JsonParser;
@@ -22,6 +36,7 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
+import org.hibernate.type.internal.ParameterizedTypeImpl;
 
 /**
  * @author Christian Beikov
@@ -29,18 +44,24 @@
 public final class JacksonXmlFormatMapper implements FormatMapper {
 
 	public static final String SHORT_NAME = "jackson-xml";
+	private boolean legacyFormat;
 
 	private final ObjectMapper objectMapper;
 
 	public JacksonXmlFormatMapper() {
-		this( createXmlMapper() );
+		this( true );
+	}
+
+	public JacksonXmlFormatMapper(boolean legacyFormat) {
+		this( createXmlMapper( legacyFormat ) );
+		this.legacyFormat = legacyFormat;
 	}
 
 	public JacksonXmlFormatMapper(ObjectMapper objectMapper) {
 		this.objectMapper = objectMapper;
 	}
 
-	private static XmlMapper createXmlMapper() {
+	private static XmlMapper createXmlMapper(boolean legacyFormat) {
 		final XmlMapper xmlMapper = new XmlMapper();
 		// needed to automatically find and register Jackson's jsr310 module for java.time support
 		xmlMapper.findAndRegisterModules();
@@ -50,6 +71,10 @@ private static XmlMapper createXmlMapper() {
 		// see: https://github.com/FasterXML/jackson-dataformat-xml/issues/344
 		final SimpleModule module = new SimpleModule();
 		module.addDeserializer( String[].class, new StringArrayDeserializer() );
+		if ( !legacyFormat ) {
+			module.addDeserializer( byte[].class, new ByteArrayDeserializer() );
+			module.addSerializer( byte[].class, new ByteArraySerializer() );
+		}
 		xmlMapper.registerModule( module );
 		return xmlMapper;
 	}
@@ -60,6 +85,50 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 			return (T) charSequence.toString();
 		}
 		try {
+			if ( !legacyFormat ) {
+				if ( Map.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					final Type keyType;
+					final Type elementType;
+					if ( javaType.getJavaType() instanceof ParameterizedType parameterizedType ) {
+						keyType = parameterizedType.getActualTypeArguments()[0];
+						elementType = parameterizedType.getActualTypeArguments()[1];
+					}
+					else {
+						keyType = Object.class;
+						elementType = Object.class;
+					}
+					final MapWrapper<?, ?> collectionWrapper = objectMapper.readValue(
+							charSequence.toString(),
+							objectMapper.constructType( new ParameterizedTypeImpl( MapWrapper.class,
+									new Type[] {keyType, elementType}, null ) )
+					);
+					final Map<Object, Object> map = new LinkedHashMap<>( collectionWrapper.entry.size() );
+					for ( EntryWrapper<?, ?> entry : collectionWrapper.entry ) {
+						map.put( entry.key, entry.value );
+					}
+					return javaType.wrap( map, wrapperOptions );
+				}
+				else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					final Type elementType = javaType.getJavaType() instanceof ParameterizedType parameterizedType
+							? parameterizedType.getActualTypeArguments()[0]
+							: Object.class;
+					final CollectionWrapper<?> collectionWrapper = objectMapper.readValue(
+							charSequence.toString(),
+							objectMapper.constructType(
+									new ParameterizedTypeImpl( CollectionWrapper.class, new Type[] {elementType},
+											null ) )
+					);
+					return javaType.wrap( collectionWrapper.value, wrapperOptions );
+				}
+				else if ( javaType.getJavaTypeClass().isArray() ) {
+					final CollectionWrapper<?> collectionWrapper = objectMapper.readValue(
+							charSequence.toString(),
+							objectMapper.constructType( new ParameterizedTypeImpl( CollectionWrapper.class,
+									new Type[] {javaType.getJavaTypeClass().getComponentType()}, null ) )
+					);
+					return javaType.wrap( collectionWrapper.value, wrapperOptions );
+				}
+			}
 			return objectMapper.readValue(
 					charSequence.toString(),
 					objectMapper.constructType( javaType.getJavaType() )
@@ -75,6 +144,60 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 		if ( javaType.getJavaType() == String.class || javaType.getJavaType() == Object.class ) {
 			return (String) value;
 		}
+		if ( !legacyFormat ) {
+			if ( Map.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+				final Type keyType;
+				final Type elementType;
+				if ( javaType.getJavaType() instanceof ParameterizedType parameterizedType ) {
+					keyType = parameterizedType.getActualTypeArguments()[0];
+					elementType = parameterizedType.getActualTypeArguments()[1];
+				}
+				else {
+					keyType = Object.class;
+					elementType = Object.class;
+				}
+				final MapWrapper<Object, Object> mapWrapper = new MapWrapper<>();
+				for ( Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet() ) {
+					mapWrapper.entry.add( new EntryWrapper<>( entry.getKey(), entry.getValue() ) );
+				}
+				return writeValueAsString(
+						mapWrapper,
+						javaType,
+						new ParameterizedTypeImpl( MapWrapper.class, new Type[] {keyType, elementType}, null )
+				);
+			}
+			else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+				final Type elementType = javaType.getJavaType() instanceof ParameterizedType parameterizedType
+						? parameterizedType.getActualTypeArguments()[0]
+						: Object.class;
+				return writeValueAsString(
+						new CollectionWrapper<>( (Collection<?>) value ),
+						javaType,
+						new ParameterizedTypeImpl( CollectionWrapper.class, new Type[] {elementType}, null )
+				);
+			}
+			else if ( javaType.getJavaTypeClass().isArray() ) {
+				final CollectionWrapper<Object> collectionWrapper;
+				if ( Object[].class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					collectionWrapper = new CollectionWrapper<>( Arrays.asList( (Object[]) value ) );
+				}
+				else {
+					// Primitive arrays get a special treatment
+					final int length = Array.getLength( value );
+					final List<Object> list = new ArrayList<>( length );
+					for ( int i = 0; i < length; i++ ) {
+						list.add( Array.get( value, i ) );
+					}
+					collectionWrapper = new CollectionWrapper<>( list );
+				}
+				return writeValueAsString(
+						collectionWrapper,
+						javaType,
+						new ParameterizedTypeImpl( CollectionWrapper.class,
+								new Type[] {javaType.getJavaTypeClass().getComponentType()}, null )
+				);
+			}
+		}
 		return writeValueAsString( value, javaType, javaType.getJavaType() );
 	}
 
@@ -87,6 +210,51 @@ private <T> String writeValueAsString(Object value, JavaType<T> javaType, Type t
 		}
 	}
 
+	@JacksonXmlRootElement(localName = "Collection")
+	public static class CollectionWrapper<E> {
+		@JacksonXmlElementWrapper(useWrapping = false)
+		@JacksonXmlProperty(localName = "e")
+		Collection<E> value;
+
+		public CollectionWrapper() {
+			this.value = new ArrayList<>();
+		}
+
+		public CollectionWrapper(Collection<E> value) {
+			this.value = value;
+		}
+	}
+
+	@JacksonXmlRootElement(localName = "Map")
+	public static class MapWrapper<K, V> {
+		@JacksonXmlElementWrapper(useWrapping = false)
+		@JacksonXmlProperty(localName = "e")
+		Collection<EntryWrapper<K, V>> entry;
+
+		public MapWrapper() {
+			this.entry = new ArrayList<>();
+		}
+
+		public MapWrapper(Collection<EntryWrapper<K, V>> entry) {
+			this.entry = entry;
+		}
+	}
+
+	public static class EntryWrapper<K, V> {
+		@JacksonXmlProperty(localName = "k")
+		K key;
+		@JacksonXmlProperty(localName = "v")
+		V value;
+
+		public EntryWrapper() {
+		}
+
+		public EntryWrapper(K key, V value) {
+			this.key = key;
+			this.value = value;
+		}
+	}
+
 	private static class StringArrayDeserializer extends JsonDeserializer<String[]> {
 		@Override
 		public String[] deserialize(JsonParser jp, DeserializationContext deserializationContext) throws IOException {
@@ -100,4 +268,28 @@ public String[] deserialize(JsonParser jp, DeserializationContext deserializatio
 			return result.toArray( String[]::new );
 		}
 	}
+
+	private static class ByteArrayDeserializer extends JsonDeserializer<byte[]> {
+		@Override
+		public byte[] deserialize(JsonParser jp, DeserializationContext deserializationContext) throws IOException {
+			return PrimitiveByteArrayJavaType.INSTANCE.fromString( jp.getValueAsString() );
+		}
+	}
+
+	public static class ByteArraySerializer extends StdSerializer<byte[]> {
+
+		public ByteArraySerializer() {
+			super( byte[].class );
+		}
+
+		@Override
+		public boolean isEmpty(SerializerProvider prov, byte[] value) {
+			return value.length == 0;
+		}
+
+		@Override
+		public void serialize(byte[] value, JsonGenerator g, SerializerProvider provider) throws IOException {
+			g.writeString( PrimitiveByteArrayJavaType.INSTANCE.toString( value ) );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
index 629d393ed189..f1ed131b6453 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbXmlFormatMapper.java
@@ -18,6 +18,8 @@
 
 import javax.xml.namespace.QName;
 
+import jakarta.xml.bind.annotation.XmlElement;
+import org.hibernate.dialect.XmlHelper;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.sql.ast.spi.StringBuilderSqlAppender;
@@ -44,8 +46,27 @@
 public final class JaxbXmlFormatMapper implements FormatMapper {
 
 	public static final String SHORT_NAME = "jaxb";
+	private final boolean legacyFormat;
+	private final String collectionElementTagName;
+	private final String mapKeyTagName;
+	private final String mapValueTagName;
 
 	public JaxbXmlFormatMapper() {
+		this( true );
+	}
+
+	public JaxbXmlFormatMapper(boolean legacyFormat) {
+		this.legacyFormat = legacyFormat;
+		if ( legacyFormat ) {
+			collectionElementTagName = "value";
+			mapKeyTagName = "key";
+			mapValueTagName = "value";
+		}
+		else {
+			collectionElementTagName = XmlHelper.ROOT_TAG;
+			mapKeyTagName = "k";
+			mapValueTagName = "v";
+		}
 	}
 
 	@Override
@@ -64,18 +85,27 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 					final Type[] typeArguments = ( (ParameterizedType) javaType.getJavaType() ).getActualTypeArguments();
 					keyClass = ReflectHelper.getClass( typeArguments[0] );
 					valueClass = ReflectHelper.getClass( typeArguments[1] );
-					context = JAXBContext.newInstance( MapWrapper.class, keyClass, valueClass );
+					if ( legacyFormat ) {
+						context = JAXBContext.newInstance( LegacyMapWrapper.class, keyClass, valueClass );
+					}
+					else {
+						context = JAXBContext.newInstance( MapWrapper.class, EntryWrapper.class, keyClass, valueClass );
+					}
 				}
 				else {
 					keyClass = Object.class;
 					valueClass = Object.class;
-					context = JAXBContext.newInstance( MapWrapper.class );
+					if ( legacyFormat ) {
+						context = JAXBContext.newInstance( LegacyMapWrapper.class );
+					}
+					else {
+						context = JAXBContext.newInstance( MapWrapper.class, EntryWrapper.class );
+					}
 				}
 				final Unmarshaller unmarshaller = context.createUnmarshaller();
-				final MapWrapper mapWrapper = (MapWrapper) unmarshaller
+				final ManagedMapWrapper mapWrapper = (ManagedMapWrapper) unmarshaller
 						.unmarshal( new StringReader( charSequence.toString() ) );
-				final Collection<Object> elements = mapWrapper.elements;
-				final Map<Object, Object> map = CollectionHelper.linkedMapOfSize( elements.size() >> 1 );
+				final Map<Object, Object> map = CollectionHelper.linkedMapOfSize( mapWrapper.size() >> 1 );
 				final JAXBIntrospector jaxbIntrospector = context.createJAXBIntrospector();
 				final JAXBElementTransformer keyTransformer;
 				final JAXBElementTransformer valueTransformer;
@@ -83,7 +113,7 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 					keyTransformer = createTransformer(
 							appender,
 							keyClass,
-							"key",
+							mapKeyTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -91,7 +121,7 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 					valueTransformer = createTransformer(
 							appender,
 							( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-							"value",
+							mapValueTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -101,7 +131,7 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 					keyTransformer = createTransformer(
 							appender,
 							keyClass,
-							"key",
+							mapKeyTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -109,16 +139,26 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 					valueTransformer = createTransformer(
 							appender,
 							valueClass,
-							"value",
+							mapValueTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
 					);
 				}
-				for ( final Iterator<Object> iterator = elements.iterator(); iterator.hasNext(); ) {
-					final Object key = keyTransformer.fromJAXBElement( iterator.next(), unmarshaller );
-					final Object value = valueTransformer.fromJAXBElement( iterator.next(), unmarshaller );
-					map.put( key, value );
+				if ( legacyFormat ) {
+					final Collection<Object> elements = ( (LegacyMapWrapper) mapWrapper).elements;
+					for ( final Iterator<Object> iterator = elements.iterator(); iterator.hasNext(); ) {
+						final Object key = keyTransformer.fromJAXBElement( iterator.next(), unmarshaller );
+						final Object value = valueTransformer.fromJAXBElement( iterator.next(), unmarshaller );
+						map.put( key, value );
+					}
+				}
+				else {
+					for ( EntryWrapper entry : ((MapWrapper) mapWrapper).entries ) {
+						final Object key = keyTransformer.fromXmlContent( entry.key );
+						final Object value = valueTransformer.fromXmlContent( entry.value );
+						map.put( key, value );
+					}
 				}
 				return javaType.wrap( map, wrapperOptions );
 			}
@@ -145,7 +185,7 @@ else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 					valueTransformer = createTransformer(
 							appender,
 							( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-							"value",
+							collectionElementTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -155,7 +195,7 @@ else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 					valueTransformer = createTransformer(
 							appender,
 							valueClass,
-							"value",
+							collectionElementTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -180,7 +220,7 @@ else if ( javaType.getJavaTypeClass().isArray() ) {
 					valueTransformer = createTransformer(
 							appender,
 							( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-							"value",
+							collectionElementTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -190,7 +230,7 @@ else if ( javaType.getJavaTypeClass().isArray() ) {
 					valueTransformer = createTransformer(
 							appender,
 							valueClass,
-							"value",
+							collectionElementTagName,
 							null,
 							jaxbIntrospector,
 							wrapperOptions
@@ -243,19 +283,28 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 				final JAXBContext context;
 				final Class<Object> keyClass;
 				final Class<Object> valueClass;
-				final MapWrapper mapWrapper = new MapWrapper();
 				final Map<?, ?> map = (Map<?, ?>) value;
 				if ( javaType.getJavaType() instanceof ParameterizedType ) {
 					final Type[] typeArguments = ( (ParameterizedType) javaType.getJavaType() ).getActualTypeArguments();
 					keyClass = ReflectHelper.getClass( typeArguments[0] );
 					valueClass = ReflectHelper.getClass( typeArguments[1] );
-					context = JAXBContext.newInstance( MapWrapper.class, keyClass, valueClass );
+					if ( legacyFormat ) {
+						context = JAXBContext.newInstance( LegacyMapWrapper.class, keyClass, valueClass );
+					}
+					else {
+						context = JAXBContext.newInstance( MapWrapper.class, EntryWrapper.class, keyClass, valueClass );
+					}
 				}
 				else {
 					if ( map.isEmpty() ) {
 						keyClass = Object.class;
 						valueClass = Object.class;
-						context = JAXBContext.newInstance( MapWrapper.class );
+						if ( legacyFormat ) {
+							context = JAXBContext.newInstance( LegacyMapWrapper.class );
+						}
+						else {
+							context = JAXBContext.newInstance( MapWrapper.class, EntryWrapper.class );
+						}
 					}
 					else {
 						final Map.Entry<?, ?> firstEntry = map.entrySet().iterator().next();
@@ -263,9 +312,15 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 						keyClass = (Class<Object>) firstEntry.getKey().getClass();
 						//noinspection unchecked
 						valueClass = (Class<Object>) firstEntry.getValue().getClass();
-						context = JAXBContext.newInstance( MapWrapper.class, keyClass, valueClass );
+						if ( legacyFormat ) {
+							context = JAXBContext.newInstance( LegacyMapWrapper.class, keyClass, valueClass );
+						}
+						else {
+							context = JAXBContext.newInstance( MapWrapper.class, EntryWrapper.class, keyClass, valueClass );
+						}
 					}
 				}
+				final ManagedMapWrapper managedMapWrapper = legacyFormat ? new LegacyMapWrapper() : new MapWrapper();
 				if ( !map.isEmpty() ) {
 					Object exampleKey = null;
 					Object exampleValue = null;
@@ -289,7 +344,7 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 					final JAXBElementTransformer keyTransformer = createTransformer(
 							appender,
 							keyClass,
-							"key",
+							mapKeyTagName,
 							exampleKey,
 							jaxbIntrospector,
 							wrapperOptions
@@ -297,17 +352,29 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 					final JAXBElementTransformer valueTransformer = createTransformer(
 							appender,
 							valueClass,
-							"value",
+							mapValueTagName,
 							exampleValue,
 							jaxbIntrospector,
 							wrapperOptions
 					);
-					for ( Map.Entry<?, ?> entry : map.entrySet() ) {
-						mapWrapper.elements.add( keyTransformer.toJAXBElement( entry.getKey() ) );
-						mapWrapper.elements.add( valueTransformer.toJAXBElement( entry.getValue() ) );
+					if ( legacyFormat ) {
+						final LegacyMapWrapper legacyMapWrapper = (LegacyMapWrapper) managedMapWrapper;
+						for ( Map.Entry<?, ?> entry : map.entrySet() ) {
+							legacyMapWrapper.elements.add( keyTransformer.toJAXBElement( entry.getKey() ) );
+							legacyMapWrapper.elements.add( valueTransformer.toJAXBElement( entry.getValue() ) );
+						}
+					}
+					else {
+						final MapWrapper mapWrapper = (MapWrapper) managedMapWrapper;
+						for ( Map.Entry<?, ?> entry : map.entrySet() ) {
+							mapWrapper.entries.add( new EntryWrapper(
+									(String) keyTransformer.toJAXBElement( entry.getKey() ).getValue(),
+									(String) valueTransformer.toJAXBElement( entry.getValue() ).getValue()
+							) );
+						}
 					}
 				}
-				createMarshaller( context ).marshal( mapWrapper, stringWriter );
+				createMarshaller( context ).marshal( managedMapWrapper, stringWriter );
 			}
 			else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 				final JAXBContext context;
@@ -347,7 +414,7 @@ else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 						valueTransformer = createTransformer(
 								appender,
 								( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-								"value",
+								collectionElementTagName,
 								exampleValue,
 								context.createJAXBIntrospector(),
 								wrapperOptions
@@ -357,7 +424,7 @@ else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 						valueTransformer = createTransformer(
 								appender,
 								valueClass,
-								"value",
+								collectionElementTagName,
 								exampleValue,
 								context.createJAXBIntrospector(),
 								wrapperOptions
@@ -389,7 +456,7 @@ else if ( javaType.getJavaTypeClass().isArray() ) {
 						transformer = createTransformer(
 								appender,
 								( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-								"value",
+								collectionElementTagName,
 								exampleElement,
 								context.createJAXBIntrospector(),
 								wrapperOptions
@@ -399,7 +466,7 @@ else if ( javaType.getJavaTypeClass().isArray() ) {
 						transformer = createTransformer(
 								appender,
 								valueClass,
-								"value",
+								collectionElementTagName,
 								exampleElement,
 								context.createJAXBIntrospector(),
 								wrapperOptions
@@ -417,7 +484,7 @@ else if ( javaType.getJavaTypeClass().isArray() ) {
 					final JavaTypeJAXBElementTransformer transformer = new JavaTypeJAXBElementTransformer(
 							appender,
 							( (BasicPluralJavaType<?>) javaType ).getElementJavaType(),
-							"value"
+							collectionElementTagName
 					);
 					for ( int i = 0; i < length; i++ ) {
 						list.add( transformer.toJAXBElement( Array.get( value, i ) ) );
@@ -500,18 +567,61 @@ private Marshaller createMarshaller(JAXBContext context) throws JAXBException {
 		return marshaller;
 	}
 
+	public static interface ManagedMapWrapper {
+		int size();
+	}
+
 	@XmlRootElement(name = "Map")
-	public static class MapWrapper {
+	public static class LegacyMapWrapper implements ManagedMapWrapper {
 		@XmlAnyElement
 		Collection<Object> elements;
 
-		public MapWrapper() {
+		public LegacyMapWrapper() {
 			this.elements = new ArrayList<>();
 		}
 
-		public MapWrapper(Collection<Object> elements) {
+		public LegacyMapWrapper(Collection<Object> elements) {
 			this.elements = elements;
 		}
+
+		@Override
+		public int size() {
+			return elements.size();
+		}
+	}
+
+	@XmlRootElement(name = "Map")
+	public static class MapWrapper implements ManagedMapWrapper {
+		@XmlElement(name = "e")
+		Collection<EntryWrapper> entries;
+
+		public MapWrapper() {
+			this.entries = new ArrayList<>();
+		}
+
+		public MapWrapper(Collection<EntryWrapper> elements) {
+			this.entries = elements;
+		}
+
+		@Override
+		public int size() {
+			return entries.size();
+		}
+	}
+
+	public static class EntryWrapper {
+		@XmlElement(name = "k", nillable = true)
+		String key;
+		@XmlElement(name = "v", nillable = true)
+		String value;
+
+		public EntryWrapper() {
+		}
+
+		public EntryWrapper(String key, String value) {
+			this.key = key;
+			this.value = value;
+		}
 	}
 
 	@XmlRootElement(name = "Collection")
@@ -531,6 +641,7 @@ public CollectionWrapper(Collection<Object> elements) {
 	private static interface JAXBElementTransformer {
 		JAXBElement<?> toJAXBElement(Object o);
 		Object fromJAXBElement(Object element, Unmarshaller unmarshaller) throws JAXBException;
+		Object fromXmlContent(String content);
 	}
 
 	private static class SimpleJAXBElementTransformer implements JAXBElementTransformer {
@@ -560,6 +671,11 @@ public Object fromJAXBElement(Object element, Unmarshaller unmarshaller) throws
 			}
 			return value;
 		}
+
+		@Override
+		public Object fromXmlContent(String content) {
+			return content;
+		}
 	}
 
 	private static class JavaTypeJAXBElementTransformer implements JAXBElementTransformer {
@@ -593,8 +709,13 @@ public JAXBElement<?> toJAXBElement(Object o) {
 
 		@Override
 		public Object fromJAXBElement(Object element, Unmarshaller unmarshaller) throws JAXBException {
-			final String value = unmarshaller.unmarshal( (Node) element, String.class ).getValue();
+			final String value = element == null ? null : unmarshaller.unmarshal( (Node) element, String.class ).getValue();
 			return value == null ? null : elementJavaType.fromEncodedString( value, 0, value.length() );
 		}
+
+		@Override
+		public Object fromXmlContent(String content) {
+			return content == null ? null : elementJavaType.fromEncodedString( content, 0, content.length() );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java b/hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java
new file mode 100644
index 000000000000..575b9784530f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/TypeConfigurationWrapperOptions.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.internal;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.LobCreator;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.TimeZone;
+
+public class TypeConfigurationWrapperOptions implements WrapperOptions {
+
+	private final TypeConfiguration typeConfiguration;
+
+	public TypeConfigurationWrapperOptions(TypeConfiguration typeConfiguration) {
+		this.typeConfiguration = typeConfiguration;
+	}
+
+	@Override
+	public Dialect getDialect() {
+		return typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
+	}
+
+	@Override
+	public SharedSessionContractImplementor getSession() {
+		return typeConfiguration.getSessionFactory().getWrapperOptions().getSession();
+	}
+
+	@Override
+	public SessionFactoryImplementor getSessionFactory() {
+		return typeConfiguration.getSessionFactory();
+	}
+
+	@Override
+	public boolean useStreamForLobBinding() {
+		return typeConfiguration.getSessionFactory().getWrapperOptions().useStreamForLobBinding();
+	}
+
+	@Override
+	public int getPreferredSqlTypeCodeForBoolean() {
+		return typeConfiguration.getCurrentBaseSqlTypeIndicators().getPreferredSqlTypeCodeForBoolean();
+	}
+
+	@Override
+	public LobCreator getLobCreator() {
+		return typeConfiguration.getSessionFactory().getWrapperOptions().getLobCreator();
+	}
+
+	@Override
+	public TimeZone getJdbcTimeZone() {
+		return typeConfiguration.getSessionFactory().getWrapperOptions().getJdbcTimeZone();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
index 32df8ad1430f..47a56a6adf55 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
@@ -488,6 +488,19 @@ public boolean preferJdbcDatetimeTypes() {
 				&& sessionFactory.getSessionFactoryOptions().isPreferJdbcDatetimeTypesInNativeQueriesEnabled();
 		}
 
+		@Override
+		public boolean isXmlFormatMapperLegacyFormatEnabled() {
+			if ( metadataBuildingContext != null ) {
+				return metadataBuildingContext.getBuildingOptions().isXmlFormatMapperLegacyFormatEnabled();
+			}
+			else if ( sessionFactory != null ) {
+				return sessionFactory.getSessionFactoryOptions().isXmlFormatMapperLegacyFormatEnabled();
+			}
+			else {
+				return false;
+			}
+		}
+
 		private Scope(TypeConfiguration typeConfiguration) {
 			this.typeConfiguration = typeConfiguration;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlArrayUnnestTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlArrayUnnestTest.java
index aaf67df2e5ee..dbb37df0327e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlArrayUnnestTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlArrayUnnestTest.java
@@ -11,6 +11,7 @@
 import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.Nulls;
 import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.query.criteria.JpaFunctionJoin;
 import org.hibernate.query.criteria.JpaRoot;
@@ -21,6 +22,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.SqlTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -158,6 +160,7 @@ public void testUnnestOrdinality(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "xmltable can't be used with a left join")
 	public void testNodeBuilderUnnestOrdinality(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlTableTest.java
index b8265c7f21fc..152669b3efae 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/xml/XmlTableTest.java
@@ -193,6 +193,7 @@ public void testNodeBuilderXmlTableObject(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase doesn't support such xpath expressions directly in xmltable. We could emulate that through generating xmlextract calls though")
 	public void testCorrelateXmlTable(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final String query = """
@@ -202,10 +203,10 @@ public void testCorrelateXmlTable(SessionFactoryScope scope) {
 					t.theString,
 					t.theBoolean
 					from XmlHolder e join lateral xmltable('/Map' passing e.xml columns
-					theInt Integer,
-					theFloat Float,
-					theString String,
-					theBoolean Boolean
+					theInt Integer path 'e[k/text()="theInt"]/v',
+					theFloat Float path 'e[k/text()="theFloat"]/v',
+					theString String path 'e[k/text()="theString"]/v',
+					theBoolean Boolean path 'e[k/text()="theBoolean"]/v'
 					) t
 					""";
 			List<Tuple> resultList = em.createQuery( query, Tuple.class ).getResultList();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
index f14a04e3a84d..7056f78cf5b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java
@@ -357,7 +357,7 @@ public static EmbeddableAggregate createAggregate1() {
 		aggregate.theBinary = new byte[] { 1 };
 		aggregate.theDate = new java.sql.Date( 2000 - 1900, 0, 1 );
 		aggregate.theTime = new Time( 1, 0, 0 );
-		aggregate.theTimestamp = new Timestamp( 2000 - 1900, 0, 1, 1, 0, 0, 1000 );
+		aggregate.theTimestamp = new Timestamp( 2000 - 1900, 0, 1, 1, 0, 0, 3000000 ); // Use 3 millis to allow representation on Sybase
 		aggregate.theInstant = LocalDateTime.of( 2000, 1, 1, 0, 0, 0 ).toInstant( ZoneOffset.UTC );
 		aggregate.theUuid = UUID.fromString( "53886a8a-7082-4879-b430-25cb94415be8" );
 		aggregate.gender = EntityOfBasics.Gender.FEMALE;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedXmlEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedXmlEmbeddableTest.java
new file mode 100644
index 000000000000..450a1244883c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedXmlEmbeddableTest.java
@@ -0,0 +1,612 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.embeddable;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
+import org.hibernate.testing.orm.domain.gambit.MutableValue;
+import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlAggregate.class)
+public class NestedXmlEmbeddableTest extends BaseSessionFactoryFunctionalTest {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {
+			XmlHolder.class
+		};
+	}
+
+	@BeforeEach
+	public void setUp() {
+		inTransaction(
+				session -> {
+					session.persist( new XmlHolder( 1L, "XYZ", 10, "String \"<abc>A&B</abc>\"", EmbeddableAggregate.createAggregate1() ) );
+					session.persist( new XmlHolder( 2L, null, 20, "String 'abc'", EmbeddableAggregate.createAggregate2() ) );
+				}
+		);
+	}
+
+	@AfterEach
+	protected void cleanupTest() {
+		inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from XmlHolder h" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testUpdate() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.find( XmlHolder.class, 1L );
+					XmlHolder.setAggregate( EmbeddableAggregate.createAggregate2() );
+					entityManager.flush();
+					entityManager.clear();
+					XmlHolder = entityManager.find( XmlHolder.class, 1L );
+					assertEquals( "XYZ", XmlHolder.theXml.stringField );
+					assertEquals( 10, XmlHolder.theXml.simpleEmbeddable.integerField );
+					assertStructEquals( EmbeddableAggregate.createAggregate2(), XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetch() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<XmlHolder> XmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 1", XmlHolder.class ).getResultList();
+					assertEquals( 1, XmlHolders.size() );
+					XmlHolder XmlHolder = XmlHolders.get( 0 );
+					assertEquals( 1L, XmlHolder.getId() );
+					assertEquals( "XYZ", XmlHolder.theXml.stringField );
+					assertEquals( 10, XmlHolder.theXml.simpleEmbeddable.integerField );
+					assertEquals( "String \"<abc>A&B</abc>\"", XmlHolder.theXml.simpleEmbeddable.doubleNested.theNested.theLeaf.stringField );
+					assertStructEquals( EmbeddableAggregate.createAggregate1(), XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetchNull() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<XmlHolder> XmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 2", XmlHolder.class ).getResultList();
+					assertEquals( 1, XmlHolders.size() );
+					XmlHolder XmlHolder = XmlHolders.get( 0 );
+					assertEquals( 2L, XmlHolder.getId() );
+					assertNull( XmlHolder.theXml.stringField );
+					assertEquals( 20, XmlHolder.theXml.simpleEmbeddable.integerField );
+					assertStructEquals( EmbeddableAggregate.createAggregate2(), XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testDomainResult() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<TheXml> structs = entityManager.createQuery( "select b.theXml from XmlHolder b where b.id = 1", TheXml.class ).getResultList();
+					assertEquals( 1, structs.size() );
+					TheXml theXml = structs.get( 0 );
+					assertEquals( "XYZ", theXml.stringField );
+					assertEquals( 10, theXml.simpleEmbeddable.integerField );
+					assertEquals( "String \"<abc>A&B</abc>\"", theXml.simpleEmbeddable.doubleNested.theNested.theLeaf.stringField );
+					assertStructEquals( EmbeddableAggregate.createAggregate1(), theXml.nested );
+				}
+		);
+	}
+
+	@Test
+	public void testSelectionItems() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<Tuple> tuples = entityManager.createQuery(
+							"select " +
+									"b.theXml.nested.theInt," +
+									"b.theXml.nested.theDouble," +
+									"b.theXml.nested.theBoolean," +
+									"b.theXml.nested.theNumericBoolean," +
+									"b.theXml.nested.theStringBoolean," +
+									"b.theXml.nested.theString," +
+									"b.theXml.nested.theInteger," +
+									"b.theXml.nested.theUrl," +
+									"b.theXml.nested.theClob," +
+									"b.theXml.nested.theBinary," +
+									"b.theXml.nested.theDate," +
+									"b.theXml.nested.theTime," +
+									"b.theXml.nested.theTimestamp," +
+									"b.theXml.nested.theInstant," +
+									"b.theXml.nested.theUuid," +
+									"b.theXml.nested.gender," +
+									"b.theXml.nested.convertedGender," +
+									"b.theXml.nested.ordinalGender," +
+									"b.theXml.nested.theDuration," +
+									"b.theXml.nested.theLocalDateTime," +
+									"b.theXml.nested.theLocalDate," +
+									"b.theXml.nested.theLocalTime," +
+									"b.theXml.nested.theZonedDateTime," +
+									"b.theXml.nested.theOffsetDateTime," +
+									"b.theXml.nested.mutableValue," +
+									"b.theXml.simpleEmbeddable," +
+									"b.theXml.simpleEmbeddable.doubleNested," +
+									"b.theXml.simpleEmbeddable.doubleNested.theNested," +
+									"b.theXml.simpleEmbeddable.doubleNested.theNested.theLeaf " +
+									"from XmlHolder b where b.id = 1",
+							Tuple.class
+					).getResultList();
+					assertEquals( 1, tuples.size() );
+					final Tuple tuple = tuples.get( 0 );
+					final EmbeddableAggregate struct = new EmbeddableAggregate();
+					struct.setTheInt( tuple.get( 0, int.class ) );
+					struct.setTheDouble( tuple.get( 1, Double.class ) );
+					struct.setTheBoolean( tuple.get( 2, Boolean.class ) );
+					struct.setTheNumericBoolean( tuple.get( 3, Boolean.class ) );
+					struct.setTheStringBoolean( tuple.get( 4, Boolean.class ) );
+					struct.setTheString( tuple.get( 5, String.class ) );
+					struct.setTheInteger( tuple.get( 6, Integer.class ) );
+					struct.setTheUrl( tuple.get( 7, URL.class ) );
+					struct.setTheClob( tuple.get( 8, String.class ) );
+					struct.setTheBinary( tuple.get( 9, byte[].class ) );
+					struct.setTheDate( tuple.get( 10, Date.class ) );
+					struct.setTheTime( tuple.get( 11, Time.class ) );
+					struct.setTheTimestamp( tuple.get( 12, Timestamp.class ) );
+					struct.setTheInstant( tuple.get( 13, Instant.class ) );
+					struct.setTheUuid( tuple.get( 14, UUID.class ) );
+					struct.setGender( tuple.get( 15, EntityOfBasics.Gender.class ) );
+					struct.setConvertedGender( tuple.get( 16, EntityOfBasics.Gender.class ) );
+					struct.setOrdinalGender( tuple.get( 17, EntityOfBasics.Gender.class ) );
+					struct.setTheDuration( tuple.get( 18, Duration.class ) );
+					struct.setTheLocalDateTime( tuple.get( 19, LocalDateTime.class ) );
+					struct.setTheLocalDate( tuple.get( 20, LocalDate.class ) );
+					struct.setTheLocalTime( tuple.get( 21, LocalTime.class ) );
+					struct.setTheZonedDateTime( tuple.get( 22, ZonedDateTime.class ) );
+					struct.setTheOffsetDateTime( tuple.get( 23, OffsetDateTime.class ) );
+					struct.setMutableValue( tuple.get( 24, MutableValue.class ) );
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate1(), struct );
+
+					SimpleEmbeddable simpleEmbeddable = tuple.get( 25, SimpleEmbeddable.class );
+					assertEquals( simpleEmbeddable.doubleNested, tuple.get( 26, DoubleNested.class ) );
+					assertEquals( simpleEmbeddable.doubleNested.theNested, tuple.get( 27, Nested.class ) );
+					assertEquals( simpleEmbeddable.doubleNested.theNested.theLeaf, tuple.get( 28, Leaf.class ) );
+					assertEquals( 10, simpleEmbeddable.integerField );
+					assertEquals( "String \"<abc>A&B</abc>\"", simpleEmbeddable.doubleNested.theNested.theLeaf.stringField );
+				}
+		);
+	}
+
+	@Test
+	public void testDeleteWhere() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "delete XmlHolder b where b.theXml is not null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ) );
+
+				}
+		);
+	}
+
+	@Test
+	public void testUpdateAggregate() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.theXml = null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-17695" )
+	public void testNullNestedAggregate() {
+		sessionFactoryScope().inTransaction(
+			entityManager -> {
+				XmlHolder XmlHolder = new XmlHolder(3L, "abc", 30, "String 'xyz'", null );
+				entityManager.persist( XmlHolder );
+			}
+		);
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.createQuery( "from XmlHolder b where b.id = 3", XmlHolder.class ).getSingleResult();
+					assertEquals( "abc", XmlHolder.theXml.stringField );
+					assertEquals( 30, XmlHolder.theXml.simpleEmbeddable.integerField );
+					assertEquals( "String 'xyz'", XmlHolder.theXml.simpleEmbeddable.doubleNested.theNested.theLeaf.stringField );
+					assertNull( XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-17695" )
+	public void testNullNestedEmbeddable() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = new XmlHolder( );
+					XmlHolder.setId( 3L );
+					XmlHolder.setTheXml( new TheXml( "abc", null, EmbeddableAggregate.createAggregate1() ) );
+					entityManager.persist( XmlHolder );
+				}
+		);
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.createQuery( "from XmlHolder b where b.id = 3", XmlHolder.class ).getSingleResult();
+					assertEquals( "abc", XmlHolder.theXml.stringField );
+					assertNull( XmlHolder.theXml.simpleEmbeddable );
+					assertStructEquals( EmbeddableAggregate.createAggregate1(), XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-17695" )
+	public void testNullNestedEmbeddableAndAggregate() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = new XmlHolder( );
+					XmlHolder.setId( 3L );
+					XmlHolder.setTheXml( new TheXml( "abc", null, null ) );
+					entityManager.persist( XmlHolder );
+				}
+		);
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.createQuery( "from XmlHolder b where b.id = 3", XmlHolder.class ).getSingleResult();
+					assertEquals( "abc", XmlHolder.theXml.stringField );
+					assertNull( XmlHolder.theXml.simpleEmbeddable );
+					assertNull( XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAggregateMember() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.theXml.nested.theString = null" ).executeUpdate();
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					struct.setTheString( null );
+					assertStructEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAggregateMemberOnNestedNull() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.theXml.simpleEmbeddable.doubleNested = null" ).executeUpdate();
+					entityManager.createMutationQuery( "update XmlHolder b set b.theXml.simpleEmbeddable.doubleNested.theNested.theLeaf.stringField = 'Abc'" ).executeUpdate();
+					assertEquals( "Abc", entityManager.find( XmlHolder.class, 1L ).getTheXml().simpleEmbeddable.doubleNested.theNested.theLeaf.stringField );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateMultipleAggregateMembers() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.theXml.nested.theString = null, b.theXml.nested.theUuid = null" ).executeUpdate();
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					struct.setTheString( null );
+					struct.setTheUuid( null );
+					assertStructEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAllAggregateMembers() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					entityManager.createMutationQuery(
+							"update XmlHolder b set " +
+									"b.theXml.nested.theInt = :theInt," +
+									"b.theXml.nested.theDouble = :theDouble," +
+									"b.theXml.nested.theBoolean = :theBoolean," +
+									"b.theXml.nested.theNumericBoolean = :theNumericBoolean," +
+									"b.theXml.nested.theStringBoolean = :theStringBoolean," +
+									"b.theXml.nested.theString = :theString," +
+									"b.theXml.nested.theInteger = :theInteger," +
+									"b.theXml.nested.theUrl = :theUrl," +
+									"b.theXml.nested.theClob = :theClob," +
+									"b.theXml.nested.theBinary = :theBinary," +
+									"b.theXml.nested.theDate = :theDate," +
+									"b.theXml.nested.theTime = :theTime," +
+									"b.theXml.nested.theTimestamp = :theTimestamp," +
+									"b.theXml.nested.theInstant = :theInstant," +
+									"b.theXml.nested.theUuid = :theUuid," +
+									"b.theXml.nested.gender = :gender," +
+									"b.theXml.nested.convertedGender = :convertedGender," +
+									"b.theXml.nested.ordinalGender = :ordinalGender," +
+									"b.theXml.nested.theDuration = :theDuration," +
+									"b.theXml.nested.theLocalDateTime = :theLocalDateTime," +
+									"b.theXml.nested.theLocalDate = :theLocalDate," +
+									"b.theXml.nested.theLocalTime = :theLocalTime," +
+									"b.theXml.nested.theZonedDateTime = :theZonedDateTime," +
+									"b.theXml.nested.theOffsetDateTime = :theOffsetDateTime," +
+									"b.theXml.nested.mutableValue = :mutableValue," +
+									"b.theXml.simpleEmbeddable.integerField = :integerField " +
+									"where b.id = 2"
+					)
+							.setParameter( "theInt", struct.getTheInt() )
+							.setParameter( "theDouble", struct.getTheDouble() )
+							.setParameter( "theBoolean", struct.isTheBoolean() )
+							.setParameter( "theNumericBoolean", struct.isTheNumericBoolean() )
+							.setParameter( "theStringBoolean", struct.isTheStringBoolean() )
+							.setParameter( "theString", struct.getTheString() )
+							.setParameter( "theInteger", struct.getTheInteger() )
+							.setParameter( "theUrl", struct.getTheUrl() )
+							.setParameter( "theClob", struct.getTheClob() )
+							.setParameter( "theBinary", struct.getTheBinary() )
+							.setParameter( "theDate", struct.getTheDate() )
+							.setParameter( "theTime", struct.getTheTime() )
+							.setParameter( "theTimestamp", struct.getTheTimestamp() )
+							.setParameter( "theInstant", struct.getTheInstant() )
+							.setParameter( "theUuid", struct.getTheUuid() )
+							.setParameter( "gender", struct.getGender() )
+							.setParameter( "convertedGender", struct.getConvertedGender() )
+							.setParameter( "ordinalGender", struct.getOrdinalGender() )
+							.setParameter( "theDuration", struct.getTheDuration() )
+							.setParameter( "theLocalDateTime", struct.getTheLocalDateTime() )
+							.setParameter( "theLocalDate", struct.getTheLocalDate() )
+							.setParameter( "theLocalTime", struct.getTheLocalTime() )
+							.setParameter( "theZonedDateTime", struct.getTheZonedDateTime() )
+							.setParameter( "theOffsetDateTime", struct.getTheOffsetDateTime() )
+							.setParameter( "mutableValue", struct.getMutableValue() )
+							.setParameter( "integerField", 5 )
+							.executeUpdate();
+					XmlHolder XmlHolder = entityManager.find( XmlHolder.class, 2L );
+					assertEquals( 5, XmlHolder.theXml.simpleEmbeddable.integerField );
+					assertStructEquals( EmbeddableAggregate.createAggregate1(), XmlHolder.getAggregate() );
+				}
+		);
+	}
+
+	private static void assertStructEquals(EmbeddableAggregate struct, EmbeddableAggregate struct2) {
+		assertArrayEquals( struct.getTheBinary(), struct2.getTheBinary() );
+		assertEquals( struct.getTheString(), struct2.getTheString() );
+		assertEquals( struct.getTheLocalDateTime(), struct2.getTheLocalDateTime() );
+		assertEquals( struct.getTheUuid(), struct2.getTheUuid() );
+	}
+
+	@Entity(name = "XmlHolder")
+	public static class XmlHolder {
+		@Id
+		private Long id;
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private TheXml theXml;
+
+		public XmlHolder() {
+		}
+
+		public XmlHolder(Long id, String stringField, Integer integerField, String leaf, EmbeddableAggregate aggregate) {
+			this.id = id;
+			this.theXml = new TheXml( stringField, integerField, leaf, aggregate );
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public TheXml getTheXml() {
+			return theXml;
+		}
+
+		public void setTheXml(TheXml struct) {
+			this.theXml = struct;
+		}
+
+		public EmbeddableAggregate getAggregate() {
+			return theXml == null ? null : theXml.nested;
+		}
+
+		public void setAggregate(EmbeddableAggregate aggregate) {
+			if ( theXml == null ) {
+				theXml = new TheXml( null, null, null, aggregate );
+			}
+			else {
+				theXml.nested = aggregate;
+			}
+		}
+
+	}
+
+	@Embeddable
+	public static class TheXml {
+		private String stringField;
+		private SimpleEmbeddable simpleEmbeddable;
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private EmbeddableAggregate nested;
+
+		public TheXml() {
+		}
+
+		public TheXml(String stringField, Integer integerField, String leaf, EmbeddableAggregate nested) {
+			this.stringField = stringField;
+			this.simpleEmbeddable = new SimpleEmbeddable( integerField, leaf );
+			this.nested = nested;
+		}
+
+		public TheXml(String stringField, SimpleEmbeddable simpleEmbeddable, EmbeddableAggregate nested) {
+			this.stringField = stringField;
+			this.simpleEmbeddable = simpleEmbeddable;
+			this.nested = nested;
+		}
+	}
+
+	@Embeddable
+	public static class SimpleEmbeddable {
+		private Integer integerField;
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private DoubleNested doubleNested;
+
+		public SimpleEmbeddable() {
+		}
+
+		public SimpleEmbeddable(Integer integerField, String leaf) {
+			this.integerField = integerField;
+			this.doubleNested = new DoubleNested( leaf );
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+
+			SimpleEmbeddable that = (SimpleEmbeddable) o;
+
+			if ( !Objects.equals( integerField, that.integerField ) ) {
+				return false;
+			}
+			return Objects.equals( doubleNested, that.doubleNested );
+		}
+
+		@Override
+		public int hashCode() {
+			int result = integerField != null ? integerField.hashCode() : 0;
+			result = 31 * result + ( doubleNested != null ? doubleNested.hashCode() : 0 );
+			return result;
+		}
+	}
+
+	@Embeddable
+	public static class DoubleNested {
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private Nested theNested;
+
+		public DoubleNested() {
+		}
+
+		public DoubleNested(String leaf) {
+			this.theNested = new Nested( leaf );
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+
+			DoubleNested that = (DoubleNested) o;
+
+			return Objects.equals( theNested, that.theNested );
+		}
+
+		@Override
+		public int hashCode() {
+			return theNested != null ? theNested.hashCode() : 0;
+		}
+	}
+
+	@Embeddable
+	public static class Nested {
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private Leaf theLeaf;
+
+		public Nested() {
+		}
+
+		public Nested(String stringField) {
+			this.theLeaf = new Leaf( stringField );
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+
+			Nested nested = (Nested) o;
+
+			return Objects.equals( theLeaf, nested.theLeaf );
+		}
+
+		@Override
+		public int hashCode() {
+			return theLeaf != null ? theLeaf.hashCode() : 0;
+		}
+	}
+
+	@Embeddable
+	public static class Leaf {
+		private String stringField;
+
+		public Leaf() {
+		}
+
+		public Leaf(String stringField) {
+			this.stringField = stringField;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+
+			Leaf leaf = (Leaf) o;
+
+			return Objects.equals( stringField, leaf.stringField );
+		}
+
+		@Override
+		public int hashCode() {
+			return stringField != null ? stringField.hashCode() : 0;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlEmbeddableTest.java
new file mode 100644
index 000000000000..3392085176f8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlEmbeddableTest.java
@@ -0,0 +1,351 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.embeddable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
+import org.hibernate.testing.orm.domain.gambit.MutableValue;
+import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlAggregate.class)
+public class XmlEmbeddableTest extends BaseSessionFactoryFunctionalTest {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {
+			XmlHolder.class
+		};
+	}
+
+	@BeforeEach
+	public void setUp() {
+		inTransaction(
+				session -> {
+					session.persist( new XmlHolder( 1L, EmbeddableAggregate.createAggregate1() ) );
+					session.persist( new XmlHolder( 2L, EmbeddableAggregate.createAggregate2() ) );
+				}
+		);
+	}
+
+	@AfterEach
+	protected void cleanupTest() {
+		inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from XmlHolder h" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testUpdate() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.find( XmlHolder.class, 1L );
+					XmlHolder.setAggregate( EmbeddableAggregate.createAggregate2() );
+					entityManager.flush();
+					entityManager.clear();
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate2(), entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey( "HHH-16682" )
+	public void testDirtyChecking() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.find( XmlHolder.class, 1L );
+					XmlHolder.getAggregate().setTheString( "MyString" );
+					entityManager.flush();
+					entityManager.clear();
+					assertEquals( "MyString", entityManager.find( XmlHolder.class, 1L ).getAggregate().getTheString() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetch() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<XmlHolder> XmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 1", XmlHolder.class ).getResultList();
+					assertEquals( 1, XmlHolders.size() );
+					assertEquals( 1L, XmlHolders.get( 0 ).getId() );
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate1(), XmlHolders.get( 0 ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetchNull() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<XmlHolder> xmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 2", XmlHolder.class ).getResultList();
+					assertEquals( 1, xmlHolders.size() );
+					assertEquals( 2L, xmlHolders.get( 0 ).getId() );
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate2(), xmlHolders.get( 0 ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testDomainResult() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<EmbeddableAggregate> structs = entityManager.createQuery( "select b.aggregate from XmlHolder b where b.id = 1", EmbeddableAggregate.class ).getResultList();
+					assertEquals( 1, structs.size() );
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate1(), structs.get( 0 ) );
+				}
+		);
+	}
+
+	@Test
+	public void testSelectionItems() {
+		sessionFactoryScope().inSession(
+				entityManager -> {
+					List<Tuple> tuples = entityManager.createQuery(
+							"select " +
+									"b.aggregate.theInt," +
+									"b.aggregate.theDouble," +
+									"b.aggregate.theBoolean," +
+									"b.aggregate.theNumericBoolean," +
+									"b.aggregate.theStringBoolean," +
+									"b.aggregate.theString," +
+									"b.aggregate.theInteger," +
+									"b.aggregate.theUrl," +
+									"b.aggregate.theClob," +
+									"b.aggregate.theBinary," +
+									"b.aggregate.theDate," +
+									"b.aggregate.theTime," +
+									"b.aggregate.theTimestamp," +
+									"b.aggregate.theInstant," +
+									"b.aggregate.theUuid," +
+									"b.aggregate.gender," +
+									"b.aggregate.convertedGender," +
+									"b.aggregate.ordinalGender," +
+									"b.aggregate.theDuration," +
+									"b.aggregate.theLocalDateTime," +
+									"b.aggregate.theLocalDate," +
+									"b.aggregate.theLocalTime," +
+									"b.aggregate.theZonedDateTime," +
+									"b.aggregate.theOffsetDateTime," +
+									"b.aggregate.mutableValue " +
+									"from XmlHolder b where b.id = 1",
+							Tuple.class
+					).getResultList();
+					assertEquals( 1, tuples.size() );
+					final Tuple tuple = tuples.get( 0 );
+					final EmbeddableAggregate struct = new EmbeddableAggregate();
+					struct.setTheInt( tuple.get( 0, int.class ) );
+					struct.setTheDouble( tuple.get( 1, Double.class ) );
+					struct.setTheBoolean( tuple.get( 2, Boolean.class ) );
+					struct.setTheNumericBoolean( tuple.get( 3, Boolean.class ) );
+					struct.setTheStringBoolean( tuple.get( 4, Boolean.class ) );
+					struct.setTheString( tuple.get( 5, String.class ) );
+					struct.setTheInteger( tuple.get( 6, Integer.class ) );
+					struct.setTheUrl( tuple.get( 7, URL.class ) );
+					struct.setTheClob( tuple.get( 8, String.class ) );
+					struct.setTheBinary( tuple.get( 9, byte[].class ) );
+					struct.setTheDate( tuple.get( 10, Date.class ) );
+					struct.setTheTime( tuple.get( 11, Time.class ) );
+					struct.setTheTimestamp( tuple.get( 12, Timestamp.class ) );
+					struct.setTheInstant( tuple.get( 13, Instant.class ) );
+					struct.setTheUuid( tuple.get( 14, UUID.class ) );
+					struct.setGender( tuple.get( 15, EntityOfBasics.Gender.class ) );
+					struct.setConvertedGender( tuple.get( 16, EntityOfBasics.Gender.class ) );
+					struct.setOrdinalGender( tuple.get( 17, EntityOfBasics.Gender.class ) );
+					struct.setTheDuration( tuple.get( 18, Duration.class ) );
+					struct.setTheLocalDateTime( tuple.get( 19, LocalDateTime.class ) );
+					struct.setTheLocalDate( tuple.get( 20, LocalDate.class ) );
+					struct.setTheLocalTime( tuple.get( 21, LocalTime.class ) );
+					struct.setTheZonedDateTime( tuple.get( 22, ZonedDateTime.class ) );
+					struct.setTheOffsetDateTime( tuple.get( 23, OffsetDateTime.class ) );
+					struct.setMutableValue( tuple.get( 24, MutableValue.class ) );
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate1(), struct );
+				}
+		);
+	}
+
+	@Test
+	public void testDeleteWhere() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "delete XmlHolder b where b.aggregate is not null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ) );
+
+				}
+		);
+	}
+
+	@Test
+	public void testUpdateAggregate() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate = null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAggregateMember() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate.theString = null" ).executeUpdate();
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					struct.setTheString( null );
+					EmbeddableAggregate.assertEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateMultipleAggregateMembers() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate.theString = null, b.aggregate.theUuid = null" ).executeUpdate();
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					struct.setTheString( null );
+					struct.setTheUuid( null );
+					EmbeddableAggregate.assertEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAllAggregateMembers() {
+		sessionFactoryScope().inTransaction(
+				entityManager -> {
+					EmbeddableAggregate struct = EmbeddableAggregate.createAggregate1();
+					entityManager.createMutationQuery(
+									"update XmlHolder b set " +
+											"b.aggregate.theInt = :theInt," +
+											"b.aggregate.theDouble = :theDouble," +
+											"b.aggregate.theBoolean = :theBoolean," +
+											"b.aggregate.theNumericBoolean = :theNumericBoolean," +
+											"b.aggregate.theStringBoolean = :theStringBoolean," +
+											"b.aggregate.theString = :theString," +
+											"b.aggregate.theInteger = :theInteger," +
+											"b.aggregate.theUrl = :theUrl," +
+											"b.aggregate.theClob = :theClob," +
+											"b.aggregate.theBinary = :theBinary," +
+											"b.aggregate.theDate = :theDate," +
+											"b.aggregate.theTime = :theTime," +
+											"b.aggregate.theTimestamp = :theTimestamp," +
+											"b.aggregate.theInstant = :theInstant," +
+											"b.aggregate.theUuid = :theUuid," +
+											"b.aggregate.gender = :gender," +
+											"b.aggregate.convertedGender = :convertedGender," +
+											"b.aggregate.ordinalGender = :ordinalGender," +
+											"b.aggregate.theDuration = :theDuration," +
+											"b.aggregate.theLocalDateTime = :theLocalDateTime," +
+											"b.aggregate.theLocalDate = :theLocalDate," +
+											"b.aggregate.theLocalTime = :theLocalTime," +
+											"b.aggregate.theZonedDateTime = :theZonedDateTime," +
+											"b.aggregate.theOffsetDateTime = :theOffsetDateTime," +
+											"b.aggregate.mutableValue = :mutableValue " +
+											"where b.id = 2"
+							)
+							.setParameter( "theInt", struct.getTheInt() )
+							.setParameter( "theDouble", struct.getTheDouble() )
+							.setParameter( "theBoolean", struct.isTheBoolean() )
+							.setParameter( "theNumericBoolean", struct.isTheNumericBoolean() )
+							.setParameter( "theStringBoolean", struct.isTheStringBoolean() )
+							.setParameter( "theString", struct.getTheString() )
+							.setParameter( "theInteger", struct.getTheInteger() )
+							.setParameter( "theUrl", struct.getTheUrl() )
+							.setParameter( "theClob", struct.getTheClob() )
+							.setParameter( "theBinary", struct.getTheBinary() )
+							.setParameter( "theDate", struct.getTheDate() )
+							.setParameter( "theTime", struct.getTheTime() )
+							.setParameter( "theTimestamp", struct.getTheTimestamp() )
+							.setParameter( "theInstant", struct.getTheInstant() )
+							.setParameter( "theUuid", struct.getTheUuid() )
+							.setParameter( "gender", struct.getGender() )
+							.setParameter( "convertedGender", struct.getConvertedGender() )
+							.setParameter( "ordinalGender", struct.getOrdinalGender() )
+							.setParameter( "theDuration", struct.getTheDuration() )
+							.setParameter( "theLocalDateTime", struct.getTheLocalDateTime() )
+							.setParameter( "theLocalDate", struct.getTheLocalDate() )
+							.setParameter( "theLocalTime", struct.getTheLocalTime() )
+							.setParameter( "theZonedDateTime", struct.getTheZonedDateTime() )
+							.setParameter( "theOffsetDateTime", struct.getTheOffsetDateTime() )
+							.setParameter( "mutableValue", struct.getMutableValue() )
+							.executeUpdate();
+					EmbeddableAggregate.assertEquals( EmbeddableAggregate.createAggregate1(), entityManager.find( XmlHolder.class, 2L ).getAggregate() );
+				}
+		);
+	}
+
+	//tag::embeddable-xml-type-mapping-example[]
+	@Entity(name = "XmlHolder")
+	public static class XmlHolder {
+
+		@Id
+		private Long id;
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private EmbeddableAggregate aggregate;
+
+		//end::embeddable-xml-type-mapping-example[]
+		//Getters and setters are omitted for brevity
+
+		public XmlHolder() {
+		}
+
+		public XmlHolder(Long id, EmbeddableAggregate aggregate) {
+			this.id = id;
+			this.aggregate = aggregate;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public EmbeddableAggregate getAggregate() {
+			return aggregate;
+		}
+
+		public void setAggregate(EmbeddableAggregate aggregate) {
+			this.aggregate = aggregate;
+		}
+
+	//tag::embeddable-xml-type-mapping-example[]
+	}
+
+	//end::embeddable-xml-type-mapping-example[]
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java
new file mode 100644
index 000000000000..3a2c0dc70fe2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java
@@ -0,0 +1,347 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.embeddable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
+import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
+import org.hibernate.testing.orm.domain.gambit.MutableValue;
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@JiraKey("HHH-15862")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlAggregate.class)
+@BootstrapServiceRegistry(
+		// Clear the type cache, otherwise we might run into ORA-21700: object does not exist or is marked for delete
+		integrators = SharedDriverManagerTypeCacheClearingIntegrator.class
+)
+// Don't reorder columns in the types here to avoid the need to rewrite the test
+@ServiceRegistry(settings = {
+		@Setting(name = AvailableSettings.COLUMN_ORDERING_STRATEGY, value = "legacy"),
+		@Setting(name = AvailableSettings.XML_FORMAT_MAPPER, value = "jaxb")
+})
+@DomainModel(annotatedClasses = XmlWithArrayEmbeddableTest.XmlHolder.class)
+@SessionFactory
+public class XmlWithArrayEmbeddableTest {
+
+	@BeforeEach
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.persist( new XmlHolder( 1L, EmbeddableWithArrayAggregate.createAggregate1() ) );
+					session.persist( new XmlHolder( 2L, EmbeddableWithArrayAggregate.createAggregate2() ) );
+				}
+		);
+	}
+
+	@AfterEach
+	protected void cleanupTest(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from XmlHolder h" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	public void testUpdate(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					XmlHolder XmlHolder = entityManager.find( XmlHolder.class, 1L );
+					XmlHolder.setAggregate( EmbeddableWithArrayAggregate.createAggregate2() );
+					entityManager.flush();
+					entityManager.clear();
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate2(), entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetch(SessionFactoryScope scope) {
+		scope.inSession(
+				entityManager -> {
+					List<XmlHolder> XmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 1", XmlHolder.class ).getResultList();
+					assertEquals( 1, XmlHolders.size() );
+					assertEquals( 1L, XmlHolders.get( 0 ).getId() );
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate1(), XmlHolders.get( 0 ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testFetchNull(SessionFactoryScope scope) {
+		scope.inSession(
+				entityManager -> {
+					List<XmlHolder> XmlHolders = entityManager.createQuery( "from XmlHolder b where b.id = 2", XmlHolder.class ).getResultList();
+					assertEquals( 1, XmlHolders.size() );
+					assertEquals( 2L, XmlHolders.get( 0 ).getId() );
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate2(), XmlHolders.get( 0 ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	public void testDomainResult(SessionFactoryScope scope) {
+		scope.inSession(
+				entityManager -> {
+					List<EmbeddableWithArrayAggregate> structs = entityManager.createQuery( "select b.aggregate from XmlHolder b where b.id = 1", EmbeddableWithArrayAggregate.class ).getResultList();
+					assertEquals( 1, structs.size() );
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate1(), structs.get( 0 ) );
+				}
+		);
+	}
+
+	@Test
+	public void testSelectionItems(SessionFactoryScope scope) {
+		scope.inSession(
+				entityManager -> {
+					List<Tuple> tuples = entityManager.createQuery(
+							"select " +
+									"b.aggregate.theInt," +
+									"b.aggregate.theDouble," +
+									"b.aggregate.theBoolean," +
+									"b.aggregate.theNumericBoolean," +
+									"b.aggregate.theStringBoolean," +
+									"b.aggregate.theString," +
+									"b.aggregate.theInteger," +
+									"b.aggregate.theUrl," +
+									"b.aggregate.theClob," +
+									"b.aggregate.theBinary," +
+									"b.aggregate.theDate," +
+									"b.aggregate.theTime," +
+									"b.aggregate.theTimestamp," +
+									"b.aggregate.theInstant," +
+									"b.aggregate.theUuid," +
+									"b.aggregate.gender," +
+									"b.aggregate.convertedGender," +
+									"b.aggregate.ordinalGender," +
+									"b.aggregate.theDuration," +
+									"b.aggregate.theLocalDateTime," +
+									"b.aggregate.theLocalDate," +
+									"b.aggregate.theLocalTime," +
+									"b.aggregate.theZonedDateTime," +
+									"b.aggregate.theOffsetDateTime," +
+									"b.aggregate.mutableValue " +
+									"from XmlHolder b where b.id = 1",
+							Tuple.class
+					).getResultList();
+					assertEquals( 1, tuples.size() );
+					final Tuple tuple = tuples.get( 0 );
+					final EmbeddableWithArrayAggregate struct = new EmbeddableWithArrayAggregate();
+					struct.setTheInt( tuple.get( 0, int[].class ) );
+					struct.setTheDouble( tuple.get( 1, double[].class ) );
+					struct.setTheBoolean( tuple.get( 2, Boolean[].class ) );
+					struct.setTheNumericBoolean( tuple.get( 3, Boolean[].class ) );
+					struct.setTheStringBoolean( tuple.get( 4, Boolean[].class ) );
+					struct.setTheString( tuple.get( 5, String[].class ) );
+					struct.setTheInteger( tuple.get( 6, Integer[].class ) );
+					struct.setTheUrl( tuple.get( 7, URL[].class ) );
+					struct.setTheClob( tuple.get( 8, String[].class ) );
+					struct.setTheBinary( tuple.get( 9, byte[][].class ) );
+					struct.setTheDate( tuple.get( 10, Date[].class ) );
+					struct.setTheTime( tuple.get( 11, Time[].class ) );
+					struct.setTheTimestamp( tuple.get( 12, Timestamp[].class ) );
+					struct.setTheInstant( tuple.get( 13, Instant[].class ) );
+					struct.setTheUuid( tuple.get( 14, UUID[].class ) );
+					struct.setGender( tuple.get( 15, EntityOfBasics.Gender[].class ) );
+					struct.setConvertedGender( tuple.get( 16, EntityOfBasics.Gender[].class ) );
+					struct.setOrdinalGender( tuple.get( 17, EntityOfBasics.Gender[].class ) );
+					struct.setTheDuration( tuple.get( 18, Duration[].class ) );
+					struct.setTheLocalDateTime( tuple.get( 19, LocalDateTime[].class ) );
+					struct.setTheLocalDate( tuple.get( 20, LocalDate[].class ) );
+					struct.setTheLocalTime( tuple.get( 21, LocalTime[].class ) );
+					struct.setTheZonedDateTime( tuple.get( 22, ZonedDateTime[].class ) );
+					struct.setTheOffsetDateTime( tuple.get( 23, OffsetDateTime[].class ) );
+					struct.setMutableValue( tuple.get( 24, MutableValue[].class ) );
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate1(), struct );
+				}
+		);
+	}
+
+	@Test
+	public void testDeleteWhere(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "delete XmlHolder b where b.aggregate is not null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ) );
+
+				}
+		);
+	}
+
+	@Test
+	public void testUpdateAggregate(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate = null" ).executeUpdate();
+					assertNull( entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateAggregateMember(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate.theString = null" ).executeUpdate();
+					EmbeddableWithArrayAggregate struct = EmbeddableWithArrayAggregate.createAggregate1();
+					struct.setTheString( null );
+					EmbeddableWithArrayAggregate.assertEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					entityManager.createMutationQuery( "update XmlHolder b set b.aggregate.theString = null, b.aggregate.theUuid = null" ).executeUpdate();
+					EmbeddableWithArrayAggregate struct = EmbeddableWithArrayAggregate.createAggregate1();
+					struct.setTheString( null );
+					struct.setTheUuid( null );
+					EmbeddableWithArrayAggregate.assertEquals( struct, entityManager.find( XmlHolder.class, 1L ).getAggregate() );
+				}
+		);
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsXmlComponentUpdate.class)
+	@SkipForDialect( dialectClass = OracleDialect.class, reason = "External driver fix required")
+	public void testUpdateAllAggregateMembers(SessionFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					EmbeddableWithArrayAggregate struct = EmbeddableWithArrayAggregate.createAggregate1();
+					entityManager.createMutationQuery(
+									"update XmlHolder b set " +
+											"b.aggregate.theInt = :theInt," +
+											"b.aggregate.theDouble = :theDouble," +
+											"b.aggregate.theBoolean = :theBoolean," +
+											"b.aggregate.theNumericBoolean = :theNumericBoolean," +
+											"b.aggregate.theStringBoolean = :theStringBoolean," +
+											"b.aggregate.theString = :theString," +
+											"b.aggregate.theInteger = :theInteger," +
+											"b.aggregate.theUrl = :theUrl," +
+											"b.aggregate.theClob = :theClob," +
+											"b.aggregate.theBinary = :theBinary," +
+											"b.aggregate.theDate = :theDate," +
+											"b.aggregate.theTime = :theTime," +
+											"b.aggregate.theTimestamp = :theTimestamp," +
+											"b.aggregate.theInstant = :theInstant," +
+											"b.aggregate.theUuid = :theUuid," +
+											"b.aggregate.gender = :gender," +
+											"b.aggregate.convertedGender = :convertedGender," +
+											"b.aggregate.ordinalGender = :ordinalGender," +
+											"b.aggregate.theDuration = :theDuration," +
+											"b.aggregate.theLocalDateTime = :theLocalDateTime," +
+											"b.aggregate.theLocalDate = :theLocalDate," +
+											"b.aggregate.theLocalTime = :theLocalTime," +
+											"b.aggregate.theZonedDateTime = :theZonedDateTime," +
+											"b.aggregate.theOffsetDateTime = :theOffsetDateTime," +
+											"b.aggregate.mutableValue = :mutableValue " +
+											"where b.id = 2"
+							)
+							.setParameter( "theInt", struct.getTheInt() )
+							.setParameter( "theDouble", struct.getTheDouble() )
+							.setParameter( "theBoolean", struct.getTheBoolean() )
+							.setParameter( "theNumericBoolean", struct.getTheNumericBoolean() )
+							.setParameter( "theStringBoolean", struct.getTheStringBoolean() )
+							.setParameter( "theString", struct.getTheString() )
+							.setParameter( "theInteger", struct.getTheInteger() )
+							.setParameter( "theUrl", struct.getTheUrl() )
+							.setParameter( "theClob", struct.getTheClob() )
+							.setParameter( "theBinary", struct.getTheBinary() )
+							.setParameter( "theDate", struct.getTheDate() )
+							.setParameter( "theTime", struct.getTheTime() )
+							.setParameter( "theTimestamp", struct.getTheTimestamp() )
+							.setParameter( "theInstant", struct.getTheInstant() )
+							.setParameter( "theUuid", struct.getTheUuid() )
+							.setParameter( "gender", struct.getGender() )
+							.setParameter( "convertedGender", struct.getConvertedGender() )
+							.setParameter( "ordinalGender", struct.getOrdinalGender() )
+							.setParameter( "theDuration", struct.getTheDuration() )
+							.setParameter( "theLocalDateTime", struct.getTheLocalDateTime() )
+							.setParameter( "theLocalDate", struct.getTheLocalDate() )
+							.setParameter( "theLocalTime", struct.getTheLocalTime() )
+							.setParameter( "theZonedDateTime", struct.getTheZonedDateTime() )
+							.setParameter( "theOffsetDateTime", struct.getTheOffsetDateTime() )
+							.setParameter( "mutableValue", struct.getMutableValue() )
+							.executeUpdate();
+					EmbeddableWithArrayAggregate.assertEquals( EmbeddableWithArrayAggregate.createAggregate1(), entityManager.find( XmlHolder.class, 2L ).getAggregate() );
+				}
+		);
+	}
+
+	@Entity(name = "XmlHolder")
+	public static class XmlHolder {
+
+		@Id
+		private Long id;
+		@JdbcTypeCode(SqlTypes.SQLXML)
+		private EmbeddableWithArrayAggregate aggregate;
+
+		//Getters and setters are omitted for brevity
+
+		public XmlHolder() {
+		}
+
+		public XmlHolder(Long id, EmbeddableWithArrayAggregate aggregate) {
+			this.id = id;
+			this.aggregate = aggregate;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public EmbeddableWithArrayAggregate getAggregate() {
+			return aggregate;
+		}
+
+		public void setAggregate(EmbeddableWithArrayAggregate aggregate) {
+			this.aggregate = aggregate;
+		}
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java
new file mode 100644
index 000000000000..f6d23f8ec730
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java
@@ -0,0 +1,325 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.type.format;
+
+import org.hibernate.testing.orm.domain.StandardDomainModel;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SessionFactoryScopeAware;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
+import org.hibernate.type.format.FormatMapper;
+import org.hibernate.type.format.jackson.JacksonXmlFormatMapper;
+import org.hibernate.type.format.jaxb.JaxbXmlFormatMapper;
+import org.hibernate.type.internal.ParameterizedTypeImpl;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(standardModels = StandardDomainModel.LIBRARY)
+@SessionFactory
+public class XmlFormatterTest implements SessionFactoryScopeAware {
+
+	private SessionFactoryScope scope;
+
+	@Override
+	public void injectSessionFactoryScope(SessionFactoryScope scope) {
+		this.scope = scope;
+	}
+
+	private static Stream<Arguments> formatMappers() {
+		return Stream.of( new JaxbXmlFormatMapper( false ), new JacksonXmlFormatMapper( false ) )
+				.map( Arguments::of );
+	}
+
+	@ParameterizedTest
+	@MethodSource("formatMappers")
+	public void testCollection(FormatMapper formatMapper) {
+		assertCollection( List.of(), Integer.class, formatMapper );
+		assertCollection( Arrays.asList( new Integer[]{ null } ), Integer.class, formatMapper );
+		assertCollection( List.of( "Abc" ), String.class, formatMapper );
+		assertCollection( List.of( 123 ), Integer.class, formatMapper );
+	}
+
+	@ParameterizedTest
+	@MethodSource("formatMappers")
+	public void testArray(FormatMapper formatMapper) {
+		assertArray( new int[0], formatMapper );
+		assertArray( new String[]{ null }, formatMapper );
+		assertArray( new String[]{ "Abc" }, formatMapper );
+		assertArray( new int[]{ 123 }, formatMapper );
+		assertArray( new Integer[]{ 123 }, formatMapper );
+	}
+
+	@ParameterizedTest
+	@MethodSource("formatMappers")
+	public void testByteArray(FormatMapper formatMapper) {
+		assertArray( new byte[0][0], formatMapper );
+		assertArray( new byte[][]{ new byte[]{ 1 } }, formatMapper );
+	}
+
+	@ParameterizedTest
+	@MethodSource("formatMappers")
+	public void testMap(FormatMapper formatMapper) {
+		assertMap( Map.of(), Integer.class, Integer.class, formatMapper );
+		assertMap( new HashMap<>(){{ put(null, "Abc"); }}, Integer.class, String.class, formatMapper );
+		assertMap( new HashMap<>(){{ put(123, null); }}, Integer.class, String.class, formatMapper );
+		assertMap( Map.of( 123, "Abc" ), Integer.class, String.class, formatMapper );
+	}
+
+	private void assertCollection(List<Object> values, Type elementType, FormatMapper formatMapper) {
+		assertXmlEquals( expectedCollectionString( values ), collectionToString( values, elementType, formatMapper ) );
+	}
+
+	private void assertArray(Object values, FormatMapper formatMapper) {
+		assertXmlEquals( expectedArrayString( values ), arrayToString( values, formatMapper ) );
+	}
+
+	private void assertMap(Map<?, ?> values, Type keyType, Type elementType, FormatMapper formatMapper) {
+		assertXmlEquals( expectedMapString( values ), mapToString( values, keyType, elementType, formatMapper ) );
+	}
+
+	private String expectedArrayString(Object values) {
+		if ( values instanceof Object[] array ) {
+			return expectedCollectionString( Arrays.asList( array ) );
+		}
+		else {
+			final int length = Array.getLength( values );
+			final ArrayList<Object> list = new ArrayList<>( length );
+			for ( int i = 0; i < length; i++ ) {
+				list.add( Array.get( values, i ) );
+			}
+			return expectedCollectionString( list );
+		}
+	}
+
+	private String expectedCollectionString(Collection<?> values) {
+		final StringBuilder sb = new StringBuilder();
+		sb.append( "<Collection" );
+		if ( values.isEmpty() ) {
+			sb.append( "/>" );
+		}
+		else {
+			sb.append( ">" );
+			for ( Object value : values ) {
+				if ( value == null ) {
+					sb.append( "<e xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" );
+				}
+				else {
+					sb.append( "<e>" );
+					if ( value instanceof byte[] bytes ) {
+						sb.append( PrimitiveByteArrayJavaType.INSTANCE.toString( bytes ) );
+					}
+					else {
+						sb.append( value );
+					}
+					sb.append( "</e>" );
+				}
+			}
+			sb.append( "</Collection>" );
+		}
+		return sb.toString();
+	}
+
+	private String expectedMapString(Map<?, ?> values) {
+		final StringBuilder sb = new StringBuilder();
+		sb.append( "<Map" );
+		if ( values.isEmpty() ) {
+			sb.append( "/>" );
+		}
+		else {
+			sb.append( ">" );
+			for ( Map.Entry<?, ?> entry : values.entrySet() ) {
+				final Object key = entry.getKey();
+				final Object value = entry.getValue();
+				sb.append( "<e>" );
+
+				if ( key == null ) {
+					sb.append( "<k xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" );
+				}
+				else {
+					sb.append( "<k>" );
+					if ( key instanceof byte[] bytes ) {
+						sb.append( PrimitiveByteArrayJavaType.INSTANCE.toString( bytes ) );
+					}
+					else {
+						sb.append( key );
+					}
+					sb.append( "</k>" );
+				}
+				if ( value == null ) {
+					sb.append( "<v xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" );
+				}
+				else {
+					sb.append( "<v>" );
+					if ( value instanceof byte[] bytes ) {
+						sb.append( PrimitiveByteArrayJavaType.INSTANCE.toString( bytes ) );
+					}
+					else {
+						sb.append( value );
+					}
+					sb.append( "</v>" );
+				}
+				sb.append( "</e>" );
+			}
+			sb.append( "</Map>" );
+		}
+		return sb.toString();
+	}
+
+	private String collectionToString(Collection<?> value, Type elementType, FormatMapper formatMapper) {
+		final JavaType<Object> javaType = scope.getSessionFactory().getTypeConfiguration().getJavaTypeRegistry()
+				.resolveDescriptor( new ParameterizedTypeImpl( Collection.class, new Type[] {elementType}, null ) );
+		final WrapperOptions wrapperOptions = scope.getSessionFactory().getWrapperOptions();
+		final String actualValue = formatMapper.toString(
+				value,
+				javaType,
+				wrapperOptions
+		);
+		assertXmlEquals(
+				actualValue,
+				formatMapper.toString(
+						formatMapper.fromString( actualValue, javaType, wrapperOptions ),
+						javaType,
+						wrapperOptions
+				)
+		);
+		return actualValue;
+	}
+
+	private String arrayToString(Object value, FormatMapper formatMapper) {
+		final JavaType<Object> javaType = scope.getSessionFactory().getTypeConfiguration().getJavaTypeRegistry()
+				.resolveDescriptor( value.getClass() );
+		final WrapperOptions wrapperOptions = scope.getSessionFactory().getWrapperOptions();
+		final String actualValue = formatMapper.toString(
+				value,
+				javaType,
+				wrapperOptions
+		);
+		assertXmlEquals(
+				actualValue,
+				formatMapper.toString(
+						formatMapper.fromString( actualValue, javaType, wrapperOptions ),
+						javaType,
+						wrapperOptions
+				)
+		);
+		return actualValue;
+	}
+
+	private String mapToString(Map<?, ?> value, Type keyType, Type elementType, FormatMapper formatMapper) {
+		final JavaType<Object> javaType = scope.getSessionFactory().getTypeConfiguration().getJavaTypeRegistry()
+				.resolveDescriptor( new ParameterizedTypeImpl( Map.class, new Type[] {keyType, elementType}, null ) );
+		final WrapperOptions wrapperOptions = scope.getSessionFactory().getWrapperOptions();
+		final String actualValue = formatMapper.toString(
+				value,
+				javaType,
+				wrapperOptions
+		);
+		assertXmlEquals(
+				actualValue,
+				formatMapper.toString(
+						formatMapper.fromString( actualValue, javaType, wrapperOptions ),
+						javaType,
+						wrapperOptions
+				)
+		);
+		return actualValue;
+	}
+
+	private void assertXmlEquals(String expected, String actual) {
+		final Document expectedDoc = parseXml( xmlNormalize( expected ) );
+		final Document actualDoc = parseXml( xmlNormalize( actual ) );
+		normalize( expectedDoc );
+		normalize( actualDoc );
+		assertEquals( toXml( expectedDoc ).trim(), toXml( actualDoc ).trim() );
+	}
+
+	private void normalize(Document document) {
+		normalize( document.getChildNodes() );
+	}
+
+	private void normalize(NodeList childNodes) {
+		for ( int i = 0; i < childNodes.getLength(); i++ ) {
+			final Node childNode = childNodes.item( i );
+			if ( childNode.getNodeType() == Node.ELEMENT_NODE ) {
+				normalize( childNode.getChildNodes() );
+			}
+			else if ( childNode.getNodeType() == Node.TEXT_NODE ) {
+				if ( childNode.getNodeValue().isBlank() ) {
+					childNode.getParentNode().removeChild( childNode );
+				}
+				else {
+					childNode.setNodeValue( childNode.getNodeValue().trim() );
+				}
+			}
+			else if ( childNode.getNodeType() == Node.COMMENT_NODE ) {
+				childNode.setNodeValue( childNode.getNodeValue().trim() );
+			}
+		}
+	}
+
+	private String xmlNormalize(String doc) {
+		final String prefix = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+		return doc.startsWith( "<?xml" ) ? doc : prefix + doc;
+	}
+
+	private static Document parseXml(String document) {
+		final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		try {
+			final DocumentBuilder db = dbf.newDocumentBuilder();
+			return db.parse( new InputSource( new StringReader( document ) ) );
+		}
+		catch (ParserConfigurationException | IOException | SAXException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	private static String toXml(Document document) {
+		final TransformerFactory tf = TransformerFactory.newInstance();
+		try {
+			final Transformer transformer = tf.newTransformer();
+			transformer.setOutputProperty( OutputKeys.OMIT_XML_DECLARATION, "yes");
+			transformer.setOutputProperty( OutputKeys.INDENT, "yes" );
+			final StringWriter writer = new StringWriter();
+			transformer.transform( new DOMSource( document ), new StreamResult( writer ) );
+			return writer.toString();
+		}
+		catch (TransformerException e) {
+			throw new RuntimeException( e );
+		}
+	}
+}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
index 174ae834d0cd..1522a522b696 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
@@ -600,7 +600,8 @@ public boolean apply(Dialect dialect) {
 								null,
 								null,
 								new BasicTypeImpl<>( StringJavaType.INSTANCE, VarcharJdbcType.INSTANCE )
-						)
+						),
+						new TypeConfiguration()
 				) != null;
 			}
 			catch (UnsupportedOperationException | IllegalArgumentException e) {
@@ -626,7 +627,8 @@ public boolean apply(Dialect dialect) {
 								null,
 								null,
 								new BasicTypeImpl<>( StringJavaType.INSTANCE, VarcharJdbcType.INSTANCE )
-						)
+						),
+						new TypeConfiguration()
 				) != null;
 			}
 			catch (UnsupportedOperationException | IllegalArgumentException e) {
@@ -652,7 +654,8 @@ public boolean apply(Dialect dialect) {
 								null,
 								null,
 								new BasicTypeImpl<>( StringJavaType.INSTANCE, VarcharJdbcType.INSTANCE )
-						)
+						),
+						new TypeConfiguration()
 				) != null;
 			}
 			catch (UnsupportedOperationException | IllegalArgumentException e) {
@@ -673,6 +676,18 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsXmlComponentUpdate implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			try {
+				dialect.getAggregateSupport().requiresAggregateCustomWriteExpressionRenderer( SqlTypes.SQLXML );
+				return true;
+			}
+			catch (UnsupportedOperationException | IllegalArgumentException e) {
+				return false;
+			}
+		}
+	}
+
 	public static class SupportsJsonValue implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "json_value" );
diff --git a/migration-guide.adoc b/migration-guide.adoc
index 91fd7476ea76..f1333ec22697 100644
--- a/migration-guide.adoc
+++ b/migration-guide.adoc
@@ -315,10 +315,10 @@ The default precision for SQL Server timestamps was changed to 7 i.e. 100 nanose
 
 Note that these changes only affect DDL generation.
 
-[[array-mapping-changes-on-db2-sap-hana-and-sybase-ase]]
-== Array mapping changes on DB2, SAP HANA and Sybase ASE
+[[array-mapping-changes-on-db2-sap-hana-sql-server-and-sybase-ase]]
+== Array mapping changes on DB2, SAP HANA, SQL Server and Sybase ASE
 
-On DB2, SAP HANA and Sybase ASE, basic arrays now map to the `SqlTypes.XML_ARRAY` type code,
+On DB2, SAP HANA, SQL Server and Sybase ASE, basic arrays now map to the `SqlTypes.XML_ARRAY` type code,
 whereas previously, the dialect mapped arrays to `SqlTypes.VARBINARY`.
 The `SqlTypes.XML_ARRAY` type uses the `xml` DDL type which enables using arrays in other features through the various XML functions.
 
@@ -338,6 +338,19 @@ The migration requires to read data and re-save it.
 
 To retain backwards compatibility, configure the setting `hibernate.type.preferred_array_jdbc_type` to `VARBINARY`.
 
+[[xml-format-mapper-changes]]
+== XML FormatMapper changes
+
+Previous versions of Hibernate ORM used an undefined/provider-specific format for serialization/deserialization of
+collections, maps and byte arrays to/from XML, which is not portable.
+
+XML FormatMapper implementations were changed to now use a portable format for collections, maps and byte arrays.
+This change is necessary to allow mapping basic arrays as `SqlTypes.XML_ARRAY`.
+
+The migration requires to read data and re-save it.
+
+To retain backwards compatibility, configure the setting `hibernate.type.xml_format_mapper.legacy_format` to `true`.
+
 [[sf-name]]
 == SessionFactory Name (and JNDI)
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
index f6405224e7da..9fc9a03f6882 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
@@ -436,6 +436,11 @@ public boolean isPreferNativeEnumTypesEnabled() {
 		return MetadataBuildingContext.super.isPreferNativeEnumTypesEnabled();
 	}
 
+	@Override
+	public boolean isXmlFormatMapperLegacyFormatEnabled() {
+		return false;
+	}
+
 	@Override
 	public FastSessionServices getFastSessionServices() {
 		throw new UnsupportedOperationException("operation not supported");