Merge #10999 fix.