Merged to 1.1