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