Imported Upstream version 4.0.0
Merge tag 'upstream/4.0.0'

Upstream version 4.0.0
Integrated upstream version 4.0