(COMMIT-38) JPA configuration changes