Merge pull request #120002 from StarryWorm/fix-119889