Update from upstream v3.9.0