Merge pull request #31433 from asahay19/4623