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