fix bug in pull updated events, improved performance
Merge branch 'hotfix/2.1.18'