Merge tag 'upstream/1.4.0'

Upstream version 1.4.0