DDBEASY 223 - Scroll functionality fixes.
Merge branch 'DDBEASY-223' into development