New upstream version 1.17.21.
(cherry picked from commit 9889d53bce8bf3b2f0c435517634329b306b7772
and commit 48159fccdc5f39694a2c5039e586fbd5fee53bc4
and commit 7370ddcaf4a39234eb899c1e723b5c7e50ff124f
and commit 9596dea44f82ee4d798364e7ef2a9f4b9ba04888)