Merge remote-tracking branch 'upstream/pull/1687'