prevent scroll up
Merge branch 'master' into events