Merge tag 'upstream/1.10.4'

Upstream version 1.10.4