#852096 implement JPA2 and test