merging more changes from 1.1.x