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