Fix PR14692