I've created [HV-896](https://hibernate.atlassian.net/browse/HV-896) for another CS-related issue.