This PR cherry-picks the following commits: - 6e51b95e2c Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
6e51b95e2c