Imported Upstream version 2.17.2
Merge tag 'upstream/2.17.2'