Merge remote-tracking branch 'upstream/version-1.2.0'