Hotfix 0.24.x rt58183