Update upstream source from tag 'upstream/0.9.4'