Merge tag 'upstream/1.10.2'

Upstream version 1.10.2