There's no Hibernate.next branch yet where this can be applied, so I'll just keep a branch locally and see how the integration goes.