Yes, I will put this on scope for the next sprint where we want to move to Hibernate [5.4.2|tel:542] .