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