Merge branch 'hotfix-2.1.17'
Merge branch 'hotfix-2.1.17'
fix bug in pull updated events, improved performance
Merge branch 'hotfix/2.1.18' into develop