Merge 1.1.x with minor conflict