Backports various fixes and tests from Berry - #327

Bugbot Analysis Progress (1m 18s elapsed)

✅ Gathered PR context (5s)
✅ Completed bug detection (1m 12s)
✅ Posted analysis results (1s)

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

Request ID: serverGenReqId_19d7b85d-185d-4432-a31b-2b3098c2819d