Merged with upstream 10.0.10