Update to upstream v3.15.11