CAUSEWAY-3800 - merge in jpa