Update upstream source from tag 'upstream/2.0'