Preliminary pagination for visualizations and overlays
Merge branch 'fix/1888' into 2.1