Merged from upstream v1.0.9