Merge branch 'V1.1-1' into V1.1