JPA-45 - Apply EntityGraph changes