Merge branch 'v3-jpa' into v3-jpa-SNAPSHOT