Backport of gh-11621

Comment From: github-actions[bot]

Fixed via 53a3ff89320f6f56579418639ff64c1ed689248c

Comment From: github-actions[bot]

Fixed via 7c7f9380c7003e4e7e3973ca972d540d7c53f6f3