Merge tag 'upstream/1.10.0'

Upstream version 1.10.0