Release: Merge patches to main
(without version bump)
#27162
Merged
main
(without version bump)
#27162