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