Update upstream to 1.12.1