Merged from upstream v1.4.40