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