[Gitflow] Merge master into develop - #22021

Bugbot Analysis Progress (37s elapsed)

✅ Gathered PR context (4s)
✅ Completed bug detection (32s)
✅ Posted analysis results (1s)

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

Request ID: serverGenReqId_bc37e030-11d3-4805-be57-bc985a694c12