ed90cae
New upstream version 1.17.24. (cherry picked from commit c054bd608eae1ce97671e0aa891be627fd822fff)