Revert "Revert "JPA""

This reverts commit af49ef0a1dccf22eae8bd5ac23d82ab58f801aa8.