fix for group paging
merge
row hiding
merge conflicts