Merge tag 'upstream/1.6.2'

Upstream version 1.6.2