Merge PR #56755 into main