Imported Upstream version 8.0.7
Merge tag 'upstream/8.0.7'

Upstream version 8.0.7