Merge tag 'upstream/1.4.3'

Upstream version 1.4.3