branch-25.10
