Merged from upstream v1.1.15