Fixing wrapper binding
Merging origin/dval/master-pending-fix-wrapper-bind-scroller into master