Merge branch 'hotfix/1.24.5' into stable
1.24.6
Merge branch 'master' into hotfix/1.24.6
Merge branch 'hotfix/1.24.6'