Merge branch '2086_scroll_down_up_wrap_fix'