Imported Upstream version 1.7.40
Merge tag 'upstream/1.7.40'

Upstream version 1.7.40