https://hibernate.onjira.com/browse/BVAL-394