Merge branch 'hotfix/1.25.24' into stable
1.25.25
Merge branch 'master' into hotfix/1.25.25
Merge branch 'hotfix/1.25.25'