by zhanyi
Merge remote-tracking branch 'origin/dev1.1.0' into dev1.1.0