Update stable branch with security
Similar to !122683 (merged)
Syncing the canonical stable branch with security one because of too many commits for our automation to handle.
Similar to !122683 (merged)
Syncing the canonical stable branch with security one because of too many commits for our automation to handle.