#4630 work in progress - got fixed scrolling working