Update upstream source from tag 'upstream/1.9'