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