hotfix 0.24.x rt53834