Now re-enables tableView scrolling
Merge branch 'fix/tableview_scroll' into develop