Merge branch 'hotfix/1.25.6' into stable
1.25.7
Merge branch 'master' into hotfix/1.25.7
Merge branch 'hotfix/1.25.7'