QMW-315 & QMW-319 fixes
Merge branch 'hotfix.customScroll'