Merge "Fix table pagination issue"