Merged 1.9