Porting changes from 1.2 branch