Merge branch 'hotfix/1.25.17' into stable
1.25.18
Merge branch 'master' into hotfix/1.25.18
Merge branch 'hotfix/1.25.18'