20260211-java25-fix-backwards-compat
