backporting fixes in v3-jpa-SNAPSHOT
1 file changed