Merge branch 'hotfix/1.25.9' into stable
1.25.10
Merge branch 'master' into hotfix/1.25.10
Merge branch 'hotfix/1.25.10'