Backport of gh-11710

Comment From: github-actions[bot]

Fixed via 9f00045638651de484e27764f38695af86b5eb88

Comment From: github-actions[bot]

Fixed via faf9fb7337a617467fb08ec70daaa21b59c3f487