fixbug: 1342
Merge remote-tracking branch 'origin/polygon_team' into polygon_team