Update upstream to 0.22.01