Merged with upstream 4.1.3