Merged 1.10 into 1.x