Closes PR14589.