Imported Upstream version 2.17.1
Merge tag 'upstream/2.17.1'

Upstream version 2.17.1