修复部分监控计算问题
Merge remote-tracking branch 'origin/devel' into devel