I've created [HV-813](https://hibernate.atlassian.net/browse/HV-813) for this.