Imported Upstream version 3.4
Merge tag 'upstream/3.4'

Upstream version 3.4