fix normal event reload view
Merge branch 'master' into demo