Imported Upstream version 0.8.0
Merge tag 'upstream/0.8.0'

Upstream version 0.8.0