Merge branch 'hotfix/1.24.2' into stable
1.24.3
Merge branch 'master' into hotfix/1.24.3
Merge branch 'hotfix/1.24.3'