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