Merge branch 'hotfix/1.25.25' into stable
1.25.26
Merge branch 'master' into hotfix/1.25.26, update #2859, update #2856
Merge branch 'hotfix/1.25.26'