merging in release-1.1.0 branch changes