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