Fix scroll jumping issue
Merge branch 'master' into MNF