Imported Upstream version 1.9.3.374
Merge tag 'upstream/1.9.3.374'

Upstream version 1.9.3.374