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