Merged with 1.1 branch