Merge tag 'upstream/1.6.0'

Upstream version 1.6.0