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