Porting changes from 1.1