Merge 1.1.1 into 1.2.0 - to discontinue 1.1.1