Merged 1.11