Merge "Fix duplicate code in Jpa classes"