Forward port of issue #11736 to 5.7.4.
Comment From: github-actions[bot]
Fixed via f774c4de394c8e374e073e15a3970a92a5963e03