fixed scroll by
Merging origin/dval/master-pending-scrollby-fix into master