2 Commits (hotfix/v24.2.4)