Merge tag 'upstream/1.2.3'

Upstream version 1.2.3