3b15278
New upstream version 1.17.22. (cherry picked from commit 60738297efafa99e38079de3aba4190aaea1619b and commit dd4e65882502e58dfd42e2dc3106493599a75dd0)