Merge branch 'backport-3.23-Java-version-handling' into Java-version-handling