Merge develop with JPA.