Merge commit 'upstream/1.2.0'