[Upg] resolve conflict
Merge branch '1.1' into 1.2