Merge tag 'upstream/1.10.3'

Upstream version 1.10.3