Merge tag 'upstream/1.6.1'

Upstream version 1.6.1