This pull request includes some merge commits and the format used for the changes does not conform to Hibernate code styles.

Please create a new pull request for master using the Eclipse or Intellij code style:

https://developer.jboss.org/wiki/ContributingToHibernateUsingEclipse
https://developer.jboss.org/wiki/ContributingToHibernateUsingIntelliJ

Also, please make sure you refer to the correct jira issue, HHH-9043, in your new pull request so it gets attached to the correct jira issue.

Thanks,
Gail