Merge branch 'release-2.0.0-RC3-RC1-jpa' into jpa