Update upstream source from tag 'upstream/0.7.1'