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