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