b35096b
New upstream version 1.17.40. (cherry picked from commit eb229b2bf6fc71c3443c48a8c777d561aa260782)