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