HHH-7513

See https://hibernate.atlassian.net/browse/HHH-7513 for details.