Merge branch 'release-2.1.0-RC1-jpa' into release-3.1.0-RC1-jpa