chore: sync hot-fixes to dev - #280

Bugbot Analysis Progress (13s elapsed)

✅ Gathered PR context (2s)
✅ Analyzed code changes (1s)
✅ Completed bug detection — 0 potential bugs found (10s)
✅ Validation and filtering completed (0s)
✅ Posted analysis results — 0 bugs reported (0s)
✅ Analysis completed successfully (0s)

Final Result: Bugbot completed review - no issues found! ✅

Request ID: serverGenReqId_750a48f7-bca4-4a22-9847-dd66b5888feb