6cbb8cca94
Salvaged from PR #59743. Original author email was malformed (sr@samirusani, not resolvable to a GitHub account), so the commit is re-authored with credit via trailer. Co-authored-by: Sami Rusani <samrusani@users.noreply.github.com>