Merged 1.10