Merge commit 'upstream/1.4'