by zhanyi
Merge remote-tracking branch 'origin/dev-1.1.0' into dev-1.1.0