Merge tag 'upstream/1.12.1'

Upstream version 1.12.1