Merged from upstream v0.9.18