Update upstream to 0.43d