Merge #20874 fix.