Merge tag 'upstream/1.4.1'

Upstream version 1.4.1