Fix for COS mashup paging
Merge branch 'cos-paging'