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