Fix pagination on < 600 breakpoint
Merge branch 'master' into LUN-1507