Merge tag 'upstream/1.8.0'

Upstream version 1.8.0