Merged from upstream v1.3.27