This is in alignment with 6.2.0, after backport gh-33959.

Comment From: github-actions[bot]

Fixed via f20e76e2270383ae4177ac9fb5a03d0644511622