Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2