Updated to do
Merge remote-tracking branch 'upstream/master' into patch-2