not use system time to timeout monitoring
Merge branch 'release/2.5' into develop