Thanks @Joel, can you please just change the commit message to refer to https://hibernate.atlassian.net/browse/HHH-13184 instead of to this issue.