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